I thought I had grasped the difference between the two commands , but
then Ulrich's email made me think.
> The difference is the starting point. Using peg revisions (case 1) you
are
> only saying that you are taking the thing referenced via the path and
> revision as starting point, but taking its current (HEAD) state still:
>
> svn merge -rHEAD:HEAD http://server/trunk@123
http://server/trunk@132 .
This is not clear at all.
Recently I had to merge some code from a branch, back into trunk, that
had been deleted years ago. I had, of course, have to use the peg
revisions use case. In my case then that branch did not exist in HEAD,
so it's "current state" is deleted. That is what I don't understand of
your explanation.
Linedata Services (UK) Ltd
Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB
Registered in England and Wales No 3027851 VAT Reg No 778499447
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-01-16 16:50:01 CET