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

I am new to this email message board thing, so please excuse me if I am
violating a protocol.

I have had a similar problem...

In my working copy I have..
dir_1/file.c

I rename the directory with..
svn mv dir_1 dir_2

Before I can do a commit, my buddy changes dir_1/file_a.c in his work area
and commits the change.

I update my work area with..
svn update

I now have..
dir_1/file.c
dir_2/file.c

with dir_1/file.c being more current.

At this point a commit works without error, but I loose my buddies changes.
Not Good!

So, instead if I do a unix..
cp dir_1/file.c dir_2/file.c

And then a svn commit I get a chksum error from dir_2/file.c If I try...
Svn mv dir_1/file.c dir_2/file.c

I get errors from svn.

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?

Thanks
Keith Stanley
 

-----Original Message-----
From: news [mailto:news@sea.gmane.org] On Behalf Of Eric Hanchrow
Sent: Friday, June 02, 2006 12:56 PM
To: users@subversion.tigris.org
Subject: Re: svn update doesn't merge local changes across remote directory
moves

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

http://subversion.tigris.org/issues/show_bug.cgi?id=898

-- 
            |\      _,,,---,,_
      ZZZzz /,`.-'`'    -.  ;-;;,_
           |,4-  ) )-,_. ,\ (  `'-'
          '---''(_/--'  `-'\_) fL
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org