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@648290 stepws.xsd@648291 >From merge target: stepws.xsd@610503 If necessary, you can email them in private and I promise to only share them among Subversion developers for debugging purposes.
