Re: Problems merging renamed file with contents changes

[Karl Fogel <kf...@newton.ch.collab.net>]

Colin D Bennett <cb...@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.

Thanks,
-Karl


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: Problems merging renamed file with contents changes

[Colin D Bennett <cb...@radsoft.com>]

On Tuesday 10 September 2002 11:28 am, Karl Fogel wrote:
> 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?).

I'm not sure about that. I did commit the changes in Bob's branch, so when I 
did the merge, there were actually no local mods. The workspace was pristine. 
Is this still a bug?

-- 
Colin D. Bennett <cb...@radsoft.com>
[ RADSoft: Rapid Engineering Specialists ]

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org