Ok, the fix is to do a revert in the new directory (at the old the
location) of each file that was moved along with the folder to the new
location, effectively reverting the delete in the old location and
therefore making the new folder no longer know about those files.
Thanks again Stefan!
-----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=2375028
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-07-24 00:32:03 CEST