How Do I handle a svn move When The Repository Changes?

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 their 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. If I do a svn commit, dir_1/file.c is
scheduled for deletion and subversion deletes it wiping out my buddy's
changes. Any attempts to move/copy dir_1/file.c to dir_2/file.c fails with
some type of subversion error. It appears that once a file is scheduled to
be deleted or added there is little else that can be done with that file.
Does anyone have any suggestions on how to deal with a svn move with the
repository changes?

Thanks
Keith Stanley

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jun 2 05:18:57 2006