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

Re: merge disagrees with diff

From: Stefan Sperling <stsp_at_elego.de>
Date: Fri, 28 Oct 2011 12:07:55 +0200

On Fri, Oct 28, 2011 at 11:55:06AM +0200, Flemming Frandsen wrote:
> We're having a major problem with subversion, it seems that for some
> changesets svn merge will do a different change than svn diff would
> suggest.

This does indeed look like a bug in merge.
Is it possible for you to provide the following files?

From merge source:
stepws.xsd_at_648290
stepws.xsd_at_648291

From merge target:
stepws.xsd_at_610503

If necessary, you can email them in private and I promise to only
share them among Subversion developers for debugging purposes.
Received on 2011-10-28 12:08:32 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.