Problem with Merge command

        It appears that the capabilities of the merge command in Subclipse are quite
limited: prior to it's inception, we used command-line SVN tools, and used
merging (between "/branches/dev" and "/trunk") quite heavily.

        Because there were changes in branches/dev that were not yet compatible with
trunk, some merging had to be done manually. For instance, after committing
a set of changes in branches/dev that had to be ported into trunk, I would
use the following command (both directories up-to-date, last version
committed was 2972):

                svn merge -r2971:2972 dev/ trunk/

        This effectively determines what changes were made in dev/ from 2971 -> 2972
and applies them to trunk. Obviously, not the *best* solution, but it has
definitely worked quite well. When I attempt to run what *appears* to be the
same command in Subclipse, the SVN equivalent command appears to be in the
form:

                svn merge svn+ssh://server/website/branches/dev_at_2971
svn+ssh://server/website/trunk_at_2972

        Obviously, the secondary method is more intensive, and the results of which
are catastrophically different than what was intended (just by the diff size,
the original method produces a 193-line file, while the second produces an
18,000+ lines). I realize the method we're using isn't the best, but it's
worked incredibly well thusfar, and I don't want to have to re-invent the
wheel.

        Any suggestions as to a work-around, other than resorting to command-line
utilities or completely restructuring our repository layout?

DISCLAIMER: names and locations have been changed to protect the innocent. :)

 - Dan Falconer
Head Geek, PartsLogistics.com
Received on Thu Oct 20 09:37:05 2005