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

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

From: David Weintraub <qazwart_at_gmail.com>
Date: Tue, 22 Sep 2009 12:30:40 -0400

You should only delete the directory in trunk, and then merge that change
back to the branch. The branch would then pick up the delete. When you
deleted both the file from the trunk and branch, and then tried the merge,
Subversion apparently picked it up as a conflict.

I know this happens when you add the same file to both the trunk and a
branch and then try to merge, you get this error. I have to keep reminding
developers not to do this: Add the file in one place, and merge that change
to the other place. I haven't tried to see what happens if you do this with
a delete.

My feeling is that it should be okay and no conflict alarm should sound
because there's no real conflict (I don't have a file in my branch and I
don't have it in my trunk.) It's a bit different if my trunk has a file
called "foo.java" Subversion is trying to merge to the branch, and there's
already a file called foo.java already there. In that case, there could be a
conflict because there could be two separate files with the same name. But,
Subversion might still be picking it up as a conflict.

You can safely ignore this *conflict*. Subversion has a way of sounding an
alarm for the smallest issues. Because of that, it takes away some of the
automation you might expect. Plus, it frightens easily spooked developers
who tell me that "Subversion isn't working". I guess its a philosophical
issue: I'd rather be alerted about non-issues rather than not being alerted
if an actual issue does exist.

When you get a conflict like this, and you know what's causing it, and
everything is okay, simply do a "svn resolved" on that file or directory to
let Subversion know you've taken care of it. Then, everything will be okay.

On Tue, Sep 22, 2009 at 11: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

David Weintraub
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-22 18:31:34 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.