Thanks very much for the reply Stefan. I must apologize - I made a
critical error in my description of the problem. The directory mv was in
trunk not the branch. My description of what she did *should* have read:
1) In trunk, 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
in trunk.
3) Now, after merging those changes from trunk to a branch that was
created *before* the above changes she gets the following error:
*****************
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.
Also I see that another user was able to merge trunk to a different
branch created prior to these changes successfully. I am investigating
what he did.
-----Original Message-----
From: Stefan Sperling [mailto:stsp_at_elego.de]
Sent: Thursday, July 23, 2009 4:06 PM
To: Brian Rieck
Cc: users_at_subversion.tigris.org
Subject: Re: merge problem
On Thu, Jul 23, 2009 at 03:00:20PM -0600, Brian Rieck wrote:
> 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
>
>
> Now when we merge trunk to her branch all is fine until we try to
commit
One piece of information that's missing:
What changes were made on trunk since she branched?
Also, can you try to produce a minimal sequence of Subversion commands
that creates your problem, starting with an empty repository?
Thanks,
Stefan
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2375021
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-07-24 00:17:23 CEST