| [CVS] modify multiple branches [message #43985] |
Thu, 22 May 2003 12:23  |
Eclipse User |
|
|
|
Originally posted by: patjlm.hotmail.com
Hi,
Is there an easy way to do a change in several branches at the same time.
Say, we have branch1, branch2 and HEAD.
We modify some source files in branch1 and want to report the changes in
branch2 and HEAD.
I see that there is a merge option. But it does not seem to report only my
changes, but all changes (from all developers) since the beginning of the
branch.
There is also the patch option (create a patch before commiting, and
applying this patch in all subsequent branches). But I am not sure how safe
/ easy it is.
Any input appreciated.
Thanks,
Patrick.
|
|
|
|
| Re: [CVS] modify multiple branches [message #45395 is a reply to message #45342] |
Fri, 23 May 2003 08:44  |
| Eclipse User |
|
|
|
Originally posted by: patjlm.hotmail.com
Thanks for your answer,
Is that the only way?
Or is it possible to have eclipse check stuff just before commiting?
My idea would be that when a developer chooses to commit one or several
files in a branch, eclipse could realize it and offer to create a patch, or
even to try to apply this patch in an other branch.
Would this be possible? Did anyone have an experience with this kind of
things?
Thank you,
Patrick
"Robert Klemme" <bob.news@gmx.net> wrote in message
news:bal4dt$h5k$1@rogue.oti.com...
>
> You can make a patch of your changes before checkin and apply it to the
> other branch(es).
>
> robert
>
> "Patrick Martin" <patjlm@hotmail.com> schrieb im Newsbeitrag
> news:baitir$th3$1@rogue.oti.com...
> > Hi,
> >
> > Is there an easy way to do a change in several branches at the same
> time.
> >
> > Say, we have branch1, branch2 and HEAD.
> > We modify some source files in branch1 and want to report the changes in
> > branch2 and HEAD.
> >
> > I see that there is a merge option. But it does not seem to report only
> my
> > changes, but all changes (from all developers) since the beginning of
> the
> > branch.
> >
> > There is also the patch option (create a patch before commiting, and
> > applying this patch in all subsequent branches). But I am not sure how
> safe
> > / easy it is.
> >
> > Any input appreciated.
> >
> > Thanks,
> >
> > Patrick.
> >
> >
>
|
|
|
| Re: [CVS] modify multiple branches [message #46340 is a reply to message #45395] |
Fri, 23 May 2003 12:37 |
| Eclipse User |
|
|
|
Originally posted by: bob.news.gmx.net
"Patrick Martin" <patjlm@hotmail.com> schrieb im Newsbeitrag
news:bal53s$hl3$1@rogue.oti.com...
> Thanks for your answer,
>
> Is that the only way?
>
> Or is it possible to have eclipse check stuff just before commiting?
>
> My idea would be that when a developer chooses to commit one or several
> files in a branch, eclipse could realize it and offer to create a patch,
or
> even to try to apply this patch in an other branch.
That's a very specialized application of patches. You normally don't
commit the same change on several branches. If you have to, you should
reconsider the way you work with CVS - or maybe get another SCCS.
> Would this be possible? Did anyone have an experience with this kind of
> things?
It certainly would be possible to do that. But I doubt that it has a
change being realized. IMHO it's too special. You *have* the option to
create branches in CVS because you want to separate development
activities. By automatically commiting changes from one branch to another
the whole concept of branches is questionable...
Regards
robert
>
> Thank you,
>
> Patrick
>
> "Robert Klemme" <bob.news@gmx.net> wrote in message
> news:bal4dt$h5k$1@rogue.oti.com...
> >
> > You can make a patch of your changes before checkin and apply it to
the
> > other branch(es).
> >
> > robert
> >
> > "Patrick Martin" <patjlm@hotmail.com> schrieb im Newsbeitrag
> > news:baitir$th3$1@rogue.oti.com...
> > > Hi,
> > >
> > > Is there an easy way to do a change in several branches at the same
> > time.
> > >
> > > Say, we have branch1, branch2 and HEAD.
> > > We modify some source files in branch1 and want to report the
changes in
> > > branch2 and HEAD.
> > >
> > > I see that there is a merge option. But it does not seem to report
only
> > my
> > > changes, but all changes (from all developers) since the beginning
of
> > the
> > > branch.
> > >
> > > There is also the patch option (create a patch before commiting, and
> > > applying this patch in all subsequent branches). But I am not sure
how
> > safe
> > > / easy it is.
> > >
> > > Any input appreciated.
> > >
> > > Thanks,
> > >
> > > Patrick.
> > >
> > >
> >
>
>
|
|
|
|
|
|
|
| Re: [CVS] modify multiple branches [message #48006 is a reply to message #47887] |
Mon, 26 May 2003 06:48 |
| Eclipse User |
|
|
|
Originally posted by: patjlm.hotmail.com
Hi,
I created #38042 for that. Anybody welcome to vote and comment.
However, I'd like to try to work on a plugin that would do that (so it is
available before the next stable release). The problem is that I don't know
anything (yet) about plugins. For example, how does one catch the "cvs
commit" event?
Patrick.
"Robert Klemme" <bob.news@gmx.net> wrote in message
news:basnla$of2$1@rogue.oti.com...
>
> "Eric Rizzo" <eric.rizzo@jibeinc.com> schrieb im Newsbeitrag
> news:balmld$219$1@rogue.oti.com...
> > Robert Klemme wrote:
> > > That's a very specialized application of patches. You normally don't
> > > commit the same change on several branches. If you have to, you
> should
> > > reconsider the way you work with CVS - or maybe get another SCCS.
> > [snip]
> > > It certainly would be possible to do that. But I doubt that it has a
> > > change being realized. IMHO it's too special. You *have* the option
> to
> > > create branches in CVS because you want to separate development
> > > activities. By automatically commiting changes from one branch to
> another
> > > the whole concept of branches is questionable...
> >
> > I have to disagree. A common use of branching is when a product/project
> > has a release point - you label and branch at the release point in order
> > to have maintenance of that release and new development for the next
> > release happen in parallel. If a bug is found and fixed on the
> > maintenance branch, it is likely the same fix will need to be applied to
> > the HEAD so the next version does not resurrect the bug.
>
> Sounds reasonable. Maybe then better file a feature request for this.
>
> robert
>
|
|
|
Powered by
FUDForum. Page generated in 0.18860 seconds
Home