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

Re: Local modifications to a "moved" path (again)

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-08-11 14:48:10 CEST

Nick Patavalis wrote:

> Does this means that an operation like the following will, under
> 1.1.x, be handled correctly?

No. It means that later on, if you run 'svn diff -r1 f2.txt', you won't
get an error about "f2.txt not existing in r1". Instead, the diff
command will trace back through f2.txt's history, discover it was
originally named f1.txt in r1, and use that file for comparison.

>
> User 1:
> svn co svn://server/repos/proj1/trunk p1
> cd p1
> vi f1.txt
>
> User 2:
> svn co svn://server/repos/proj1/trunk p1
> cd p1
> svn mv f1.txt f2.txt
> svn commit -m "Renamed f1.txt to f2.txt"
>
> User 1:
> svn update
> ... Adds file f2.txt ...
> ... Deletes file f1.txt ...
> ... Merges local changes to "old" f1.txt to f2.txt ...
>

This scenario will never work until the client and server have "true"
renames, not just copies+deletes. It's most likely a requirement for
implementing merge-tracking features.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 11 14:45:37 2004

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