simple svn merge question

OK, I clearly don't understand svn merge.

1. I create a trunk repo with one file, file1.txt that contains:

line 0

2. Then I branch the code from trunk into test-branch

3. I modify the file1.txt in trunk to read (and commit):

line 0
line 1

4. I modify the file1.txt in branch to read (and commit):

line 0
 
line 2

5. I switch to the trunk repo

6. Now I want to merge my branch changes in with the trunk. This
command:
C:\projects\training>svn merge branch_repo trunk_repo
doesn't change file1.txt, and this:
C:\projects\training>svn merge trunk_repo branch_repo
overwrites the branch copy onto trunk.

My questions are:
 
1. Shouldn't I either get a file with all 3 lines or a conflict raised?

2. It seems that to/from order works somewhat backwards to the way a cp
works or the Tortoise merge dialog says it does.

If I want to get the branch changes into trunk I need to:
- have a trunk working copy
- svn merge trunk_repo branch_repo
- or in Tortoise select From: trunk, To: branch

This seems counter-intuitive to me. What am I missing here?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jun 16 19:35:05 2005