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

Modifications to moved files

From: Jack Ivey <ivey_at_altair.com>
Date: 2004-02-17 15:12:19 CET

Hi all,
I have a pretty basic question. If developer B moves a file
that developer A has made local modifications to, how does
developer A recover?

If he tries to update he gets the error:
"Won't delete locally modified file 'asdf.txt'"

If he tries to commit he gets the complaint:
"Commit failed
File not found: transaction '1c', path '/movetest/originalfolder/asdf.txt'"

You could rename the modified file(s), update, poke around
the workspace or log to find the new location then manually merge
and commit the changes. Is this the best way?


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 17 15:12:47 2004

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

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