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

Re: svn update doesn't merge local changes across remote directory moves

From: Eric Hanchrow <offby1_at_blarg.net>
Date: 2006-06-02 19:55:38 CEST

>>>>> "Vineet" == Vineet Kumar <vineet@doorstop.net> writes:

    I have a situation where a user makes a local modification to a file in
    a working copy:

    Now another user goes and moves test3/project/pants to test3/pants.

    When the first user does an "svn update", they now get a new directory
    test3/pants without their local modification in it.

This one burned me, too, a long time ago. As far as I know, there's
no workaround other than vigilance. However, I hear that the
much-heralded "true rename" work will fix this (and that is precisely
why I'm so eager for that work to get released). Maybe it'll show up
in 1.5.


            |\      _,,,---,,_
      ZZZzz /,`.-'`'    -.  ;-;;,_
           |,4-  ) )-,_. ,\ (  `'-'
          '---''(_/--'  `-'\_) fL
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jun 2 20:09:57 2006

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.