[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Problems merging renamed file with contents changes

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-09-10 20:51:56 CEST

I wrote:
> Colin D Bennett <cbennett@radsoft.com> writes:
> > Is there an easier way to merge changes containing file moves on
> > files you've changed? If someone else has renamed a file I've
> > edited, and I merge in their changes, my changed file is
> > conveniently deleted and the changes lost.
>
> Actually, this is a bug. Subversion is not supposed to delete a file
> that contains local mods -- in this case, it should leave the file in
> place and report a conflict (it doesn't have to be a rename, it could
> just be a delete that triggers this bug, right?).

Oh -- sorry, Colin, misunderstood your mail and the reproduction
recipe, the first time.

The real issue here was that changes to different branched versions of
the same file were not tracked between the two files. This is
solveable, but it'll take some work. As Ben Collins-Sussman points
out, the problem is that though we are very careful about the `add'
side of a rename (we make sure that updates add exactly the same
entity that the commit added), we're not so careful about the `delete'
side of a rename (we don't make sure that what the update deletes is
really "the same" as what the commit deleted.)

In the meantime, what can one do? Well, the branch that renamed
REAMDE to README needed to first merge in any relevant changes made to
REAMDE on other branch(es), before renaming to README. By failing to
track those changes, the rename and later merge caused the changes to
disappear from the head revision, though fortunately they can still be
retrieved. Someday, Subversion will help you track those changes
conveniently, but for now, you have to do it by watching the logs.

Hope this helps,
-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Sep 10 21:14:12 2002

This is an archived mail posted to the Subversion Dev mailing list.