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

Local modifications to a "moved" path (again)

From: Nick Patavalis <npat_at_efault.net>
Date: 2004-08-11 05:18:42 CEST

I was reading the subversion 1.1 release notes, and under the "Client
Follows Renames" section, it says:

  Subversion makes a lot of noise about the way branches (copies) of
  files and directories maintain historical connections to their
  source, but in Subversion 1.0 only 'svn log' actually follows that
  history, not 'svn diff', 'svn merge', 'svn list', or 'svn cat'.

  This problem (issue 1093) is now fixed in Subversion 1.1. All client
  subcommands now transparently trace backwards through renames when
  examining older versions of files and directories.

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

  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 ...

Regards
/npat

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 11 05:31:26 2004

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