Re: svn update/diff handles renames confusingly

There is an easier way for recovery without using merge.

$ svn co -r 6441 https://svn.apache.org/repos/asf/incubator/spamassassin/trunk/rules/

$ echo '#foo' 1>>rules/70_cvs_rules_under_test.cf

$ svn up rules
svn: Won't delete locally modified file '70_cvs_rules_under_test.cf'

Look what the current version of 70_cvs_rules_under_test.cf is.

$ svn st -v rules/70_cvs_rules_under_test.cf
M 6441 6441 quinlan rules/70_cvs_rules_under_test.cf

Save the local modifications.

$ svn diff rules/70_cvs_rules_under_test.cf 1>rules/70_cvs_rules_under_test.cf.mod

Revert the local changes so update will work.

$ svn revert rules/70_cvs_rules_under_test.cf
Reverted 'rules/70_cvs_rules_under_test.cf'

$ svn up rules
D rules/70_cvs_rules_under_test.cf
Updated to revision 6688.

Now your working copy is at head revision

Look in the log for the new name.

$ svn log -v -r6441:HEAD rules >logfile

You will find the following line

A /incubator/spamassassin/trunk/rules/70_testing.cf (from /incubator/spamassassin/trunk/rules/70_cvs_rules_under_test.cf:6606)

or use the message

move 70_cvs_rules_under_test.cf to rules/70_testing.cf

Incorporate your local modifications into 70_testing.cf

If someone want to fix this, please note that there are other related problems. See Issue 1736
( http://subversion.tigris.org/issues/show_bug.cgi?id=1736 ) for an example.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Feb 16 20:17:58 2004