Hi,
claym schrieb:
> I've switched to Branch A.
>
> I do Team -> Merge
>
> I select trunk for the "From:"
Everything's correct so far...
> and Branch A to the "To:"
... but you shouldn't do this. Keep 'Use "From:" URL' checked instead.
Next, click on of the 'Show Log'-buttons and select the revision (or:
range of revisions, using shift-click) from the trunk you want to merge
to the branch. After clicking on 'OK' the two 'Revision'-fields have
been populated; 'Dry Run' and 'Merge' should work as expected now.
> I set both to Head Revision. I hit "Dry Run" or "Merge" and nothing happens.
> I'm clearly doing something wrong - what is it?
First of all, "From:" and "To:" do /not/ refer to source and target of
the merge-operation. The target of the merge-operation is /always/ your
current working-copy.
"From:" and "To:" refer to the first and the last revision to be used
during the merge-operation (or: to be considered by the merge-algorithm).
Please note that the last sentence is not really precise at all, for you
should check chapter 4 of the SVN-book
(
http://svnbook.red-bean.com/en/1.4/svn.branchmerge.html) for more info.
HTH,
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail:
users-unsubscribe@...
For additional commands, e-mail:
users-help@...
