merge problem

Forgive me if this has been covered. I wasn't able to find this exact
scenario through searching the archives.

One of our users did the following in a branch she created:

1) She moved a directory from one place to another, and committed that.

2) Then she realized that she still needed a directory in the old
location with the same name but with different files so she added the
new directory with the same name and the new files in the old location.

Now when we merge trunk to her branch all is fine until we try to commit
and we get the following error (vmc\server is the path to the old
location of the folder that was moved):

*****************

Replacing vmc\server

Deleting vmc\server\AccountPropertiesServiceTest.java

svn: Commit failed (details follow):

svn: File 'server/AccountPropertiesServiceTest.java' is out of date

svn:
'/sc/SVP/!svn/wrk/1b8b23d4-4794-d241-8d65-70937769b522/branches/user_bra
nch

es/brieck_test/platform/src/test/com/sandcherry/webservices/dictation/vm
c/server

/AccountPropertiesServiceTest.java' path not found

*******************

AccountPropertiesServiceTest.java was moved to the new location of the
old folder when it was moved. I understand how this scenario could
pretty easily confuse svn. I'm just wondering what I should do to make
everything happy again. If it were just a file I think I could use the
resolve command but that doesn't seem to help me here. In fact I didn't
see any tree conflict notices when doing the merge.

Thanks,

Brian

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2374978

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-07-23 23:01:24 CEST