[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Paul Hammant <paul_at_hammant.org>
Date: Tue, 22 Sep 2009 10:34:18 -0500

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.


- Paul


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-22 17:35:16 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.