Home » Eclipse Projects » Eclipse Platform » [CVS] automate maintenance correction commits
| [CVS] automate maintenance correction commits [message #83104] |
Thu, 26 June 2003 09:39  |
Eclipse User |
|
|
|
Originally posted by: patjlm.hotmail.com
Hi,
In my company (as in many others I believe) we use CVS branches to create
maintenance streams/releases.
Let's say we have a branch B and the HEAD.
Bug corrections go in B and HEAD. Enhancements go only in HEAD.
When a bug is corrected in B, is it possible to automate its merge in HEAD
(and/or other branches)?
The problems are:
.. Many files can be involved in a commit so it would be a pain to merge each
file manually.
.. Other developpers are working at the same time on other things, so we
don't want to merge all changes from B into HEAD, only the developper's
modification.
.. I know we can create a patch before commiting in B, but I am afraid
developpers will forget and be stuck or that they don't all quite understand
the process...
The best (in my opinion) would be to have a plugin that uses the CVS plugin
and offers a merge when commiting in a branch... or something like that. But
I don't know if this is possible or the best idea...
Thanks in advance for any input.
Patrick
|
|
|
| Re: [CVS] automate maintenance correction commits [message #83185 is a reply to message #83104] |
Thu, 26 June 2003 11:47  |
| Eclipse User |
|
|
|
Originally posted by: eric.rizzo.jibeinc.com
Patrick Martin wrote:
> Hi,
>
> In my company (as in many others I believe) we use CVS branches to create
> maintenance streams/releases.
>
> Let's say we have a branch B and the HEAD.
> Bug corrections go in B and HEAD. Enhancements go only in HEAD.
>
> When a bug is corrected in B, is it possible to automate its merge in HEAD
> (and/or other branches)?
>
> The problems are:
> . Many files can be involved in a commit so it would be a pain to merge each
> file manually.
> . Other developpers are working at the same time on other things, so we
> don't want to merge all changes from B into HEAD, only the developper's
> modification.
> . I know we can create a patch before commiting in B, but I am afraid
> developpers will forget and be stuck or that they don't all quite understand
> the process...
>
> The best (in my opinion) would be to have a plugin that uses the CVS plugin
> and offers a merge when commiting in a branch... or something like that. But
> I don't know if this is possible or the best idea...
Have you tried out the Team > Merge... functionality. Search the Eclipse
Help for "merge" for details on how to use it, but basically you load up
the branch/HEAD you want to merge into, select Team > Merge, and are
presented with a nice merge view similar to the Compare and Synchronize
views. It is a helluva lot easier than merge with any other CVS clients
I've seen.
It is especially easy if you used the Team > Branch feature in Eclipse
to create your branch, because it automatically creates appropriate
labels to make merging more straightforward.
HTH,
Eric
--
Eric Rizzo
Software Architect
Jibe, Inc.
http://www.jibeinc.com
|
|
|
| Re: [CVS] automate maintenance correction commits [message #83199 is a reply to message #83185] |
Thu, 26 June 2003 11:54 |
| Eclipse User |
|
|
|
Originally posted by: patjlm.hotmail.com
Hi,
Thanks for your answer.
However, I think this method would not work for us as it would merge all the
changes in the branch, not only the ones from the user during his last
commit.
Patrick
"Eric Rizzo" <eric.rizzo@jibeinc.com> wrote in message
news:bdf488$l7g$1@rogue.oti.com...
> Patrick Martin wrote:
> > Hi,
> >
> > In my company (as in many others I believe) we use CVS branches to
create
> > maintenance streams/releases.
> >
> > Let's say we have a branch B and the HEAD.
> > Bug corrections go in B and HEAD. Enhancements go only in HEAD.
> >
> > When a bug is corrected in B, is it possible to automate its merge in
HEAD
> > (and/or other branches)?
> >
> > The problems are:
> > . Many files can be involved in a commit so it would be a pain to merge
each
> > file manually.
> > . Other developpers are working at the same time on other things, so we
> > don't want to merge all changes from B into HEAD, only the developper's
> > modification.
> > . I know we can create a patch before commiting in B, but I am afraid
> > developpers will forget and be stuck or that they don't all quite
understand
> > the process...
> >
> > The best (in my opinion) would be to have a plugin that uses the CVS
plugin
> > and offers a merge when commiting in a branch... or something like that.
But
> > I don't know if this is possible or the best idea...
>
> Have you tried out the Team > Merge... functionality. Search the Eclipse
> Help for "merge" for details on how to use it, but basically you load up
> the branch/HEAD you want to merge into, select Team > Merge, and are
> presented with a nice merge view similar to the Compare and Synchronize
> views. It is a helluva lot easier than merge with any other CVS clients
> I've seen.
> It is especially easy if you used the Team > Branch feature in Eclipse
> to create your branch, because it automatically creates appropriate
> labels to make merging more straightforward.
>
> HTH,
> Eric
> --
> Eric Rizzo
> Software Architect
> Jibe, Inc.
> http://www.jibeinc.com
>
|
|
|
| Re: [CVS] automate maintenance correction commits [message #83911 is a reply to message #83199] |
Fri, 27 June 2003 10:23 |
| Eclipse User |
|
|
|
Originally posted by: eric.rizzo.jibeinc.com
Patrick Martin wrote:
> Hi,
>
> Thanks for your answer.
>
> However, I think this method would not work for us as it would merge all the
> changes in the branch, not only the ones from the user during his last
> commit.
>
> "Eric Rizzo" <eric.rizzo@jibeinc.com> wrote in message
> news:bdf488$l7g$1@rogue.oti.com...
>>Have you tried out the Team > Merge... functionality. Search the Eclipse
>>Help for "merge" for details on how to use it, but basically you load up
>>the branch/HEAD you want to merge into, select Team > Merge, and are
>>presented with a nice merge view similar to the Compare and Synchronize
>>views. It is a helluva lot easier than merge with any other CVS clients
>>I've seen.
>>It is especially easy if you used the Team > Branch feature in Eclipse
>>to create your branch, because it automatically creates appropriate
>>labels to make merging more straightforward.
If you label before committing to the branch, then use that label as the
"start point" for the merge, it might give you what you want.
If it does not, I think you've still got a couple of very workable
solutions, assuming you trust your developers enough to follow a simple
process and/or be able to identify their own changes from a list.
Either they create a patch file before committing to branch (the "follow
a simple procedure" solution), or they will have to use the Team Merge
feature, in which case they might have to filter out some changes other
than the ones they just committed.
I frequently do both, and unless there are a lot of conflicts it is
hardly ever painful.
HTH,
Eric
--
Eric Rizzo
Software Architect
Jibe, Inc.
http://www.jibeinc.com
|
|
|
Goto Forum:
Current Time: Thu Jul 24 08:05:18 EDT 2025
Powered by FUDForum. Page generated in 0.07272 seconds |
Home