merge with unversioned obstructions still broken in 1.6?

I was really looking foward to 1.6's tree conflict feature. In
particular I was looking forward to it fixing the long-standing bug
with merge/revert/merge causing any added-by-merge files to be skipped
by the second merge. This is by far the most irritating form of tree
conflict I run into.

The documentation in http://svn.collab.net/repos/svn/trunk/notes/tree-conflicts/
  seems to consider this case as something that should be handled, so
I'm a bit surprised to see that it apparently /has not/ been fixed by
the tree-conflicts work as it currently exists! Did that feature just
get dropped at some point along the way?

I'll note that this would be a lot less irritating if issue #3101 was
fixed. It seems pretty obvious that an unmodified add-with-history
should be completely removed by an svn revert. If that were fixed,
that merge sometimes "skips" files would be a lot less common...

Are either of these in the plans for 1.6 final?

James

Reproduction recipe below, if you're interested:

# Set up working copy (assume $repo points to a brand-new repository)
svn mkdir $repo/trunk -m ''
svn cp $repo/trunk $repo/branch -m ''

svn co $repo/branch
cd branch
echo hi > foo
svn add foo
svn commit -m ""

# Checkout trunk...
cd ..
svn co $repo/trunk
cd trunk

# Now on to the interesting part:

# # Merge branch back into trunk
svn merge --reintegrate $repo/branch
# Output:
# --- Merging differences between repository URLs into '.':
# A foo

# Oops, revert.
svn revert -R .
# Output:
# Reverted '.'
# Reverted 'foo'

# But of course, revert leaves behind an unversioned "foo" file, even
though I didn't modify it.
# Okay, now re-merge
svn merge --reintegrate $repo/branch
# Output:
# Skipped 'foo'
# Summary of conflicts:
# Skipped paths: 1

# Now it lets me commit without raising a fuss, as if the merge had
actually worked. This is sad.
svn ci -m ''

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-13 03:38:07 CET