Re: [TSVN] Cannot Merge changes made on branch

Cameron Tofer wrote:
> hi, i'm in a mess. this is what i did:
>
> 1) checked out trunk.
> 2) made a bunch of changes
> 3) realized that i should be working in a branch
> 4) made branch by using TortoiseSVN->branch/tag and added a comment
> (made rev #1846)

You made the branch from your WC instead of from the repository. In
other words you copied your WC into the repo, rather than copying HEAD
to the new branch.

> 5) to my horror i watched as all my temporary work and mess was
> committed to the server automatically

Well branches are created on the server, and if you create one from your
WC it has to commit that. The fact that there was a space to enter a log
message was a clue.

> 6) switch to the new branch and made another change and commit
> 7) gave up on ever using branching and did a switch back to trunk
> 8) used TortoiseSVN->merge setting from to the branch and the rev to
> 1846.
>
> from here merge will only update my second set of changes (#1847).
> not the mess that was automatically committed for me(#1846).

That is expected. The merge does a diff between the 2 revisions you
supply and applies it to your WC. So you have to specify the revision
just before your changes in order to include it in the diff. Lots of
people have found this confusing so shortly after the 1.1.3 release, the
merge dialog was revamped allowing you to select a range of revisions to
merge from the log dialog (and doing the -1 trick automatically). You
could try using the nightly build as it should be easier to understand.

> if i
> set the revision to one less (#1845) it complains it can't find it.

Not sure why that doesn't work.

> will i ever understand branching/merging in subversion?!

The online version of the subversion book includes quite a bit of
description of how branching and merging works (updated fairly
recently). Also the current TSVN help file (also in the nightly) has
been improved to explain this area better.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org