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

Re: How do I determine if svn:mergeinfo is corrupt and how would I fix it.

From: Philip Martin <philip_at_codematters.co.uk>
Date: Tue, 11 May 2010 17:07:53 +0100

Stefan Sperling <stsp_at_elego.de> writes:

> Blindly marking all delete vs. delete conflicts resolved is wrong
> (unless you don't care about rename conflicts).

As I said, it's debatable. One could decide that since renames don't
exist they really are just copies and deletes. In that case the
deletes don't conflict.

-- 
Philip
Received on 2010-05-11 18:08:28 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.