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

"svn patch" writes bad "original" file when launching interactive merge

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 01 Oct 2009 21:22:10 +0100

I have a patch in which some hunks apply perfectly and others should
apply with a context match at a different line number (offset by N

It applies fine with GNU "patch". When I apply it with "svn patch", the
hunks that need an offset don't apply and instead produce conflicts. I
believe that's a known deficiency at the moment, and that's not the bug
I'm raising.

When I chose "(l)aunch a merge tool" in the interactive resolver, the
"foo.svnpatch.original" file it produces is not the original file but
instead contains some "from" hunks from the patch inserted in it (at
inappropriate places, as it happens).

What I expect is that the "foo.svnpatch.original" file should be an
exact copy of what the file-to-be-patched contained before the patch
application began.

I could produce a repro script but have not done so yet.

- Julian

Received on 2009-10-01 22:22:27 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.