Svn-merge back?

Question

I just did a merge and it seemed to work the other way around as I expected it to. I am wondering if I did it wrong or is this a known issue?

I had 2 branches Experiment / Mainline

I did everything that I wanted to do in the experiment, and combine it back into the trunk. Using Tortoise, I right-click Experiment-> Merge. I chose Merge Two Different Trees, and it was (everything else is left by default). I checked that he said that Merge [Experiment] Revision Head TO [Trunk] Revision Head

The problem is that she did not apply the distinction to the torso ... she applied them to the experiment ... so now the experiment was my "torso", which is definitely the opposite of what I wanted.

Now I had to svn-delete trunk and svn-copy the contents of Experiment back to Trunk in order to fix it (as far as I can tell), but in the future this is not how it should work

Answer 1

If your working copy is in "Experiment", then where is the result of the merge.

You should mention how to create a diff that will be applied, i.e. it calculates the difference "from" x "to" y "and applies it to the working copy.

The TortoiseSVN help explains this pretty decently.

Answer 2

• Trunk, Trunk. , . , .

• "TO" "FROM" .

  URL , , Subversion , "FROM" "TO" , .

subversion , "FROM" Experiment "TO" Trunk . Trunk, , Subversion.

.

Answer 3

, , -, .

, , .

Answer 4

SVN, Subversion. .

Answer 5

, " ", " "

, , .