Re: Getting merge to ignore a directory in source and destination branch for a merge (tree conflict)

On Wed, Sep 23, 2009 at 1:34 AM, Paul Hammant <paul_at_hammant.org> wrote:

> I've deleted (svn rm) a directory 'foo/bar' in trunk and branch and
> committed, then tried to do a merge from trunk to branch.
> The merge fails though:
>
> svn: Attempt to add tree conflict that already exists at
> 'foo/bar'
> svn: Error reading spooled REPORT request response`
>
> I would have hoped that the merge would ignore this directory. This is the
> 1.6.x-R38000 branch self-built yesterday afternoon.
>
> *Is there any way to simulate 'obliterate' more effectively.*
>
> Regards,
>
> - Paul
>

Just an idea (but it might be completely wrong), but are you able (or have
you tried) to revert the delete of 'foo/bar' in the branch, commit, then
perform the merge?

Cheers,
Daniel B.

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

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