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

RE: Question about mergeinfo

From: Giulio Troccoli <Giulio.Troccoli_at_uk.linedata.com>
Date: Fri, 6 Aug 2010 15:50:36 +0100

> Of course, --ignore-ancestry will also, well ignore ancestry,
> and only do a diff. So, if you have a file with the same name
> as an earlier file with the same path/name that is not
> actually its parent you are going to get a bad merge.

Sorry, I'm a bit lost here. Could you explain this maybe with an example?

Linedata Limited
Registered Office: 85 Gracechurch St., London, EC3V 0AA
Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
Received on 2010-08-06 16:51:17 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.