[news.eclipse.tools] Re: Merging between two tags on a branch: cvs updat

[Michael Valenta <Michael_Valenta@xxxxxxx>]

Michael,

The CVS Merge tool in Eclipse bascially provides support for the same 
commands you mentioned below. For instance, "cvs update -d -j MP01 -j 
MP02 *" is accomplished by choosing MP01 as the merge startpoint and 
MP02 as the end point. As in CVS, it is perferrable if MP01 is the 
common ancestor as well as the merge startpoint (i.e. it is perferrable 
that the user ensures that both branches contain the same contents at a 
merge point which I believe is referred to as Dovetailing).

The problem with this approach is that the merge will come up with 
several false conflicts since, although the contents are the same, the 
revision numbers of the files differ. This can be handled in Eclipse by 
enabling File Content Comparison (in the toolbar) when the merge editor 
is opened. This will compare all the file contents and show only those 
incoming changes that have content differences.

To summarize, Eclipse provides merge support that mirrors that provided 
by CVS with some tools to simplify the process (i.e. file content 
comparison). It is not clear to me whether you are asking for 
confirmation that this is the case or that you are hoping for something 
more. If it is the later, please give more details of what you are 
looking for.

Michael

Michael Burton wrote:

> I'm doing release management, and I periodically need to merge from our
> STABLE branch onto our DEVELOPMENT branch (HEAD).
>
>            MP01      MP02     MP03
>     --------+---------+--------+|          STABLE
>     |       |         |        |
>     |       V         V        V
> ----+------------------------------------- DEVELOPMENT (HEAD)
>    BP (branch point)
>
>
> When using the command-line, I would use the following commands in a
> checked-out mainline repository:
>    cvs update -d -j BP -j MP01 *
>    cvs update -d -j MP01 -j MP02 *
>    cvs update -d -j MP03 -j MP03 *
>
>
> How can I accomplish the same thing with eclipse while taking advantage of
> eclipse's 3-way merge tool?  To do this, I would need to be able to set:
>     - a common ancestor
>     - a beginning tag
>     - an ending tag
>
> But so far I haven't found a way to do so using eclipse's Merge Wizard.  Any
> suggestions would be greatly appreciated.
>
> Thank you,
> Michael Burton