Re: svn commit: r996581 - in /subversion/trunk/subversion: libsvn_diff/parse-diff.c tests/cmdline/patch_tests.py

2010-09-18 Thread Daniel Shahaf
Stefan Sperling wrote on Fri, Sep 17, 2010 at 11:53:16 +0200: On Fri, Sep 17, 2010 at 01:42:09AM +0200, Daniel Shahaf wrote: Which of the two methods described in step 1 do you have in mind? Non-POSIX, for context diffs. Rephrased to apply to svn patch: svn patch will examine the

Re: svn commit: r996581 - in /subversion/trunk/subversion: libsvn_diff/parse-diff.c tests/cmdline/patch_tests.py

2010-09-18 Thread Stefan Sperling
On Sat, Sep 18, 2010 at 09:21:31AM +0200, Alan Barrett wrote: On Sat, 18 Sep 2010, Daniel Shahaf wrote: Fewest path components, shortest basename, total filename length. It's predictable, but it seems a bit arbitrary? It does seem a bit arbitrary, but I was able to rationalise it as

Re: svn commit: r996581 - in /subversion/trunk/subversion: libsvn_diff/parse-diff.c tests/cmdline/patch_tests.py

2010-09-17 Thread Stefan Sperling
On Fri, Sep 17, 2010 at 01:42:09AM +0200, Daniel Shahaf wrote: Which of the two methods described in step 1 do you have in mind? Non-POSIX, for context diffs. Rephrased to apply to svn patch: svn patch will examine the ``old'' and ``new'' file names, and choose the file name with the

Re: svn commit: r996581 - in /subversion/trunk/subversion: libsvn_diff/parse-diff.c tests/cmdline/patch_tests.py

2010-09-16 Thread Daniel Shahaf
Stefan Sperling wrote on Wed, Sep 15, 2010 at 21:40:16 +0200: On Wed, Sep 15, 2010 at 06:15:58PM +0200, Daniel Shahaf wrote: Stefan Sperling wrote on Tue, Sep 14, 2010 at 21:18:26 +0200: On Tue, Sep 14, 2010 at 12:49:06PM +0100, Julian Foad wrote: Right. The issue seems to be How do I

Re: svn commit: r996581 - in /subversion/trunk/subversion: libsvn_diff/parse-diff.c tests/cmdline/patch_tests.py

2010-09-15 Thread Daniel Shahaf
Stefan Sperling wrote on Tue, Sep 14, 2010 at 21:18:26 +0200: On Tue, Sep 14, 2010 at 12:49:06PM +0100, Julian Foad wrote: Right. The issue seems to be How do I determine what path I should apply the patch to? If the patch style is --- wc/file +++ wc/file or --- old_wc/file

Re: svn commit: r996581 - in /subversion/trunk/subversion: libsvn_diff/parse-diff.c tests/cmdline/patch_tests.py

2010-09-15 Thread Stefan Sperling
On Wed, Sep 15, 2010 at 06:15:58PM +0200, Daniel Shahaf wrote: Stefan Sperling wrote on Tue, Sep 14, 2010 at 21:18:26 +0200: On Tue, Sep 14, 2010 at 12:49:06PM +0100, Julian Foad wrote: Right. The issue seems to be How do I determine what path I should apply the patch to? If the patch

Re: svn commit: r996581 - in /subversion/trunk/subversion: libsvn_diff/parse-diff.c tests/cmdline/patch_tests.py

2010-09-14 Thread Stefan Sperling
On Tue, Sep 14, 2010 at 12:49:06PM +0100, Julian Foad wrote: Right. The issue seems to be How do I determine what path I should apply the patch to? If the patch style is --- wc/file +++ wc/file or --- old_wc/file +++ new_wc/file then you're going to be stripping the first

Re: svn commit: r996581 - in /subversion/trunk/subversion: libsvn_diff/parse-diff.c tests/cmdline/patch_tests.py

2010-09-13 Thread Julian Foad
On Mon, 2010-09-13, s...@apache.org wrote: * subversion/libsvn_diff/parse-diff.c (svn_diff_parse_next_patch): When generating a reverse diff, do not swap the old and new filenames of the patch. The old filename in a unidiff is often useless (e.g. it contains a .orig extension), but the

Re: svn commit: r996581 - in /subversion/trunk/subversion: libsvn_diff/parse-diff.c tests/cmdline/patch_tests.py

2010-09-13 Thread Stefan Sperling
On Mon, Sep 13, 2010 at 05:50:05PM +0100, Julian Foad wrote: On Mon, 2010-09-13, s...@apache.org wrote: * subversion/libsvn_diff/parse-diff.c (svn_diff_parse_next_patch): When generating a reverse diff, do not swap the old and new filenames of the patch. The old filename in a unidiff