[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:28:45 CEST

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?).

Your reproduction recipe is very thorough. Do you think you'd have
time to file your recipe as an issue, and maybe to write an XFAIL
regression test for it? (Of course, if Philip Martin is still in
form, he'll probably have it fixed by the time I send this mail :-) ).
No problem if you don't have time/inclination, just let us know so
someone else can do it.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Sep 10 20:51:03 2002

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.