[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: Stein Somers <ssomers_at_opnet.com>
Date: Tue, 22 Sep 2009 19:03:00 +0200

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.

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.

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