[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: Ryan Schmidt <subversion-2006q2_at_ryandesign.com>
Date: 2006-06-03 14:37:28 CEST

Keith Stanley wrote:

> Eric Hanchrow wrote:
>> Vineet Kumar wrote:
>>> 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.
>> http://subversion.tigris.org/issues/show_bug.cgi?id=898
> The only way I see to move directories like this is tell the whole
> group to
> stop making any commits while someone svn moves the directories and
> then
> commits them. If anyone has a better idea, I am all ears?

That's pretty much what I would do, until "true renames" are
implemented. I'd probably tell my coworkers to make sure to commit
their changes by the time they leave on Friday and do the move over
the weekend, and remind the team to update before starting work on
Monday. If your team works on weekends too or doesn't have defined
work times, then you'll have to coordinate it some other way.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jun 3 14:38:43 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.