[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Problem merging changes from Branches to Trunk

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Sat, 19 Jan 2008 11:14:24 +0000

On 10/01/2008, B. Smith-Mannschott <benpsm_at_gmail.com> wrote:
> If you read Hielke's description above, you may notice that the you're
> doing it differently. Here's what you are asking tortoisesvn to do:
> "Please make the changes necessary to get [FROM] the head revision of
> the trunk [TO] the head revision of the branch to my working copy (of
> the trunk)."
> This is precisely what subversion has done: It has applied the
> necessary changes to make your working copy of the trunk identical to
> the branch. This is almost certainly not what you want.
> What Hielke asking is quite different.
> "Please make the changes necessary to get [FROM] revision 1 of branch
> A [TO] revision 7 of branch A to my working copy (of branch B)."

That's quite a nice description of how subversion sees the merge. One
for the docs I think :-)


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-01-19 12:14:35 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.