The merger of the trunk with a branch

Question

This is the first time you try to merge the last torso head into my branch. I just want to receive the latest news from other developers of my team in my branch. I am using Subversion 1.6.7. Therefore, in the "Merge" dialog box, I selected the "Merge two different trees" option.

My question is:

The latest version of my branch is 358, and the trunk is 357. Therefore, when I do a test merge, it removes anything new in 358 (my branch). Should I switch from my trunk to a branch, and not from branch to trunk in this case, since my branch has a higher revision number? I know in the examples in different blogs that they say they come from the branch of the TO branch, but in my situation the branch has a higher version number.

alt text http://elbalazo.net/post/repobrowser.jpg

alt text http://elbalazo.net/post/merge.jpg

Now during the test merge, I don’t see why it deletes those files that do not exist in my chest (which I added to my branch during development):

alt text http://elbalazo.net/post/mergeoptions.jpg

alt text http://elbalazo.net/post/revisiongraph.jpg

alt text http://elbalazo.net/post/deleted.jpg

Now let's do the opposite ... this is how I think it should go (because then I will go from the version below (357) to the revision above (358). Mainline trunk To my branch:

alt text http://www.elbalazo.net/post/mergdialog_trunk_to_branch.jpg alt text http://www.elbalazo.net/post/testmerge_trunk_to_branch.jpg UPDATED AFTER THE COMMENT BELOW:

Ok, so when I try trunk-to-trunk, this is what I get:

alt text http://www.elbalazo.net/post/merge_trunk_to_trunk.jpg

alt text http://elbalazo.net/post/testmerge_trunk_to_trunk.jpg

Answer 1

, , .

( ) . , , "", URL- , ":" , .

, , , , , - URL- , , (, ), , .

" ", . mergeinfo ( ), .

, SVN - , SVN , (.. ). , , , . , , ( ) .

- - , - . URL- ; , .

Answer 2

, URL . , , , "trunk", .

Answer 3

, ?

, . , ? , , , ?

( , , ", " ), , r345 - 358 . , .

EDIT: , , FROM rev 358 TO rev 357 . commit 358 357 - 358 < 0, , .

Answer 4

, , , ( )

, :

• ( ) .
• " " ""
• "URL- " URL- "" ( )
• ... .

1.6, Subversion , , Subversion , .

If this is the first time you have combined anything from a trunk into a branch, it means that something from the revision after you created your branch from the revision of the HEAD trunk will be merged in your workspace of your branch, and then when you commit that the merge will be recorded. If you decide to synchronize your branch again in a week using the same steps, it will only merge any changes in the trunk that have not previously been merged.