Branch / merge issue - bug or working as intended?

I'm playing around with some branching strategies and I'm getting merge
conflicts where I don't expect to see them.
 
Basically I'm just trying to push some trivial, non-conflicting, edits
back and forth from trunk to a branch:

1. create branch
2. edit on trunk, commit
3. merge trunk changes to branch, edit on branch, commit
4. merge branch changes to trunk:
     Conflict discovered in 'afile'.
     Select: (p) postpone, (df) diff-full, (e) edit,
             (mc) mine-conflict, (tc) theirs-conflict,
             (s) show all options: dc
     initial file
     <<<<<<< MINE (select with 'mc') (2)
     trunk modification
     ||||||| ORIGINAL (2,0)
     =======
     trunk modification
     additional branch modifications
>>>>>>> THEIRS (select with 'tc') (2,2)

Can someone tell me if this is a bug or just a problem with the way I am
using svn?

Below is a simple shell script to demonstrate the issue. I've tried
1.6.3 and 1.6.5.

Thanks,
Eric

#!/bin/sh

rm -rf tmp; mkdir tmp; cd tmp

repos=`pwd`/repos
svnadmin create repos
svn co file://$repos wc
cd wc

mkdir trunk branches
echo "initial file" > trunk/afile
svn add trunk branches
svn ci -m 'init'
svn switch file://$repos/trunk

svn cp file://$repos/trunk file://$repos/branches/A -m 'Create Branch A'

echo "trunk modification" >> afile
svn ci -m 'trunk modification'

svn switch file://$repos/branches/A
svn merge file://$repos/trunk
echo "additional branch modifications" >> afile
svn ci -m 'Merge updates from trunk with branch modifications'

svn switch file://$repos/trunk
svn merge file://$repos/branches/A

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2417144

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-12 17:58:16 CET