Description Robert Klemme 2004-06-03 07:02:41 EDT

Although with the cvs command line tool it's possible to do a merge without the 
root tag, it is not with Eclipse.  It would be good to have this, especially 
for projects that started without using Eclipse and later switched over or if 
someone accidentally deleted the tag.

This feature could be realized in different ways:

(i) Manually selecting a date and a branch tag as the merge root point.

(ii) Adding a wizard that sets the "Root_{branch}" tag afterwards.  Here's a 
description of the "manually equivalent" of what this wizard would have to do:

> In order to set the tag I needed to emulate this calculation.  I did a
> little scripting that uses "cvs -N -S log -r<my branch> | egrep '^date:' |
> sort" to extract all dates on the branch to find the oldest date on the
> branch.  After that I tagged all versions on the branch my branch did
> originate from using the timestamp minus a second.

(iii) A combination of the (i) and (ii), i.e. have the wizard suggest the date 
for the manual input.

(iii) See also bug 65420