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

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.

-- 
Stein
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2398570
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].