Merge problem where a file is skipped

Someone reported this on the merge tracking early adopter forum.
Basically they created a branch in the WC and also added a file in
this new branch before committing. Now if they try to merge it does
not merge this new file, even when comparing the two URL's. I knew a
"merge tracking" merge would not copy the file but I was surprised to
see a merge that compares the URL's skip the file. Here is the
recipe:

Here is the reproduction recipe I created that demonstrates this problem:

$ svnadmin create repos
$ export R=file:///Users/mphippard/repos
$ svn co $R wc
Checked out revision 0.
$ cd wc
$ svn mkdir trunk
A trunk
$ svn mkdir branches
A branches
$ svn ci -m "Initial structure"
Adding branches
Adding trunk

Committed revision 1.
$ echo Testing > trunk/foo
$ svn add trunk/foo
A trunk/foo
$ svn ci -m "Add foo"
Adding trunk/foo
Transmitting file data .
Committed revision 2.
$ svn cp trunk branches/dummy
A branches/dummy
$ echo Testing > branches/dummy/bar
$ svn add branches/dummy/bar
A branches/dummy/bar
$ svn ci -m "Add dummy branch"
Adding branches/dummy
Adding branches/dummy/bar
Adding branches/dummy/foo
Transmitting file data .
Committed revision 3.
$ svn up
At revision 3.
$ svn merge $R/branches/dummy $R/trunk trunk
--- Merging r3:
Skipped missing target: 'trunk/bar'
 G trunk
$

In the last step, I think that "bar" should have been added, not skipped.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org