Move + Merge => lose modifications

http://subversion.tigris.org/issues/show_bug.cgi?id=2685




User malcolm changed the following:

                What    ld value 
               |New value
============================================================
====================
     IssuesThisDependsOn|898                       |
------------------------------------------------------------
--------------------
                  Status|RESOLVED                 
|REOPENED
------------------------------------------------------------
--------------------
              OS/Version|Windows 2000              |All
------------------------------------------------------------
--------------------
              QA contact|                         
|issuessubversion
------------------------------------------------------------
--------------------
                Platform|PC                        |All
------------------------------------------------------------
--------------------
              Resolution|WONTFIX                   |
------------------------------------------------------------
--------------------
            Subcomponent|svnserve                 
|libsvn_client
------------------------------------------------------------
--------------------
                 Version|1.4.x                     |trunk
------------------------------------------------------------
--------------------




------- Additional comments from malcolmtigris.org Tue Jan 16 09:06:23 -0800 2007 -------
Reopening (WONTFIX was always the wrong resolution anyway).

Perhaps I don't understand this fully, but I don't believe
that this is
conditional on issue 898 (true renames) at all.

As I understand it, we have a change on trunk that looks
like:

 Delete /trunk/oldfile
 Add /trunk/newfile (copied-from /trunk/oldfilerX)

And when we merge that to /branch/esfoo, we get this
change:

 Delete /branches/foo/oldfile
 Add /branches/foo/newfile (copied-from /trunk/oldfilerX)

i.e. the fact that we 'renamed' oldfile to newfile on trunk
has been lost, and
we've ended up replacing the file on the branch with one
from trunk.

I don't think that this is conditional on us getting a real
rename operation. 
When we do, the original change on trunk will look something
like:

 Rename /trunk/oldfile to /trunk/newfile

And we'll need to merge that as

 Rename /branches/foo/oldfile to /trunk/foo/oldfile

However, we can get exactly the same behaviour by adjusting
the copyfrom source
in the A+D case - while that won't solve the general problem
of merging a rename
over a locally-modified file, that's _not_ what was being
asked for here.

------------------------------------------------------------
---------
To unsubscribe, e-mail: issues-unsubscribesubversion.tigris.org
For additional commands, e-mail: issues-helpsubversion.tigris.org