David Corbin <firstname.lastname@example.org> wrote on 03/31/2006 08:35:19 PM:
> I made some changes to a file, and someone else moved that file. When I
> synchronized, this file was marked as a conflict (double-headed red
> I attempted to resolve differences. I double-clicked on the file
> synchronize view, and it opened the compare editor. But the one side
> comparing against BASE, which wasn't helpful at all.
> Ideally, it would recognize that the file had been moved, and show me
> HEAD file from the new location.
Subversion does not record this information, so there is no way to do
that. Basically what you are seeing is what happens when you have local
mods and the remote file has been deleted. When you do an update, your
local file will be come unversioned. You can then copy your changes into
the new file.
Subversion is working, as a long term project, on making the changes
needed in their repository format to record "true moves". Currently it
implemented as a copy+delete. Presumably, and hopefully, once these
changes are fully implemented in Subversion there will be room to improve
stuff like this.
Scanned for SoftLanding Systems, Inc. and SoftLanding Europe Plc by IBM Email Security Management Services powered by MessageLabs.
Received on Sat Apr 1 04:03:40 2006