[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: Paul Hammant <paul_at_hammant.org>
Date: Tue, 22 Sep 2009 12:11:44 -0500


- Paul

On Sep 22, 2009, at 12:03 PM, Stein Somers wrote:

> David Weintraub wrote:
>> You can safely ignore this /conflict/.
> No he can't. The merge aborts so the rest of the files are not
> merged at all.
> You're missing a bit of context in previous threads, but the line
> "svn: Error
> reading spooled REPORT request response" is the clue here.

Quite correct. Its the aborting merge that is killing us.

Right now, we're relearning C to work on tree_conflict.c to see if we
can a) provide more debug info and b) get it to not exit early.

> I haven't done the simple test Paul did, but it looks like upgrading
> to 1.6
> is not the right move yet if you're into directory renaming.

All Agile (Scrum / Extreme Programming) teams will be in that boat.

However, this is only going to be a problem for those teams if they do
feature branches :- http://martinfowler.com/bliki/FeatureBranch.html

True trunk based dev is not likely to be a problem with 1.6.3+ IMO.

- Paul


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-22 19:13:04 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.