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

Copy/move-handling on update in 1.5

From: Tor Ringstad <torhr_at_pvv.org>
Date: 2007-11-14 17:44:26 CET

The 1.5 release-note gives the impression that "copy/move-handling on
update" has been improved (issue #503). I'm trying to understand more
specifically what use-cases this covers.

I tested the following, which should be more or less exactly the
use-case described in the release-note:

WC1:

  # Prepare for test

  % touch file1
  % svn add file1
  A file1
  % svn commit -m "setup"
  Adding file1
  Transmitting file data .
  Committed revision 107.
  % svn up
  At revision 107.

WC2:

  # Rename file in other WC

  % svn up
  A file1
  Updated to revision 107.
  % svn mv file1 file2
  A file2
  D file1
  % svn commit -m "renamed"
  Deleting file1
  Adding file2
  Committed revision 108.

WC1:

  # Modify local file, get rename via update

  % echo "blahblah" >> file1
  % svn st
  M file1
  % svn up
  D file1 # note #1
  A file2
  Updated to revision 108.
  % ls -l
  total 4
  -rw-rw-r-- 1 tri tri 7 Nov 14 17:20 file1
  -rw-rw-r-- 1 tri tri 0 Nov 14 17:20 file2
  % svn st
  ? file1
  % cat file1
  blahblah
  % cat file2
  <empty>

So, the locally modified file got unversioned (but still contains the
changes), and the renamed file (which is versioned) does not contain
the changes. Which I believe is the same behaviour as with 1.4.

There is, however, a documented caveat:

  There are a few caveats: [...] Also, if an incoming move-operation
  deletes 'foo' before it attempts to copy it to 'bar', then the copy
  will fail, and the client reverts to the old behavior of fetching a
  pristine copy of the file from the repository.

Is this what hits me? I can see (note #1) that the delete appears to
happen before the copy. Is this what the caveat is talking about?

In that case, is there actually any situation where the *user* will
notice any improvements with regard to copy/move-handling on update?

- Tor Ringstad -

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Nov 14 17:45:02 2007

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