Dan Falconer wrote:
>
> 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/
It's important to remember that svn merge actually takes _3_ parameters
- the URL for the merge start point, the URL for the merge end point,
and the working directory to put the result into. For the two URL
params, you can use a working copy on your disk as a shortcut, and with
the -r range, the first two logical params are taken from the first
actual command line param. So the command you give actually exapands to:
svn merge svn+ssh://server/website/branches/dev_at_2971 \
svn+ssh://server/website/branches/dev_at_2972 trunk/
In the Subclipse merge dialog, each of the three params is in a separate
boxed area. Try to replicate the command above, and you'll get the
result you're looking for. Take advantage of the "use from URL"
checkbox for the second parameter, and enter the merge dialog by
choosing it from the right-click menu on your trunk/ resource in
Subclipse to correctly set the third parameter.
- Marc
Received on Fri Oct 21 04:11:34 2005