[email protected] wrote on Sat, Apr 20, 2013 at 21:47:39 -0000: > Author: julianfoad > Date: Sat Apr 20 21:47:39 2013 > New Revision: 1470238 > > URL: http://svn.apache.org/r1470238 > Log: > Improve labelling of the file diff in interactive conflict resolution. Show > labels like > > --- THEIRS - relpath/to/file.r1234 > +++ MERGED - relpath/to/file > > instead of like > > --- /home/julianfoad/tmp/svn/conflicts/wc/f.r1234 Thu Apr 18 15:17:49 2013 > +++ /home/julianfoad/tmp/svn/conflicts/wc/f Thu Apr 18 15:17:49 2013 > > This applies only to the 'df' option which shows a 2-way diff for a text > file; the 'dc' 3-way diff option already uses labels such as 'THEIRS' and > 'MINE'.
Have you considered flipping the order to --- relpath/to/file.r123\t- THEIRS +++ relpath/to/file\t- MERGED (with a real tab instead of \t)? This would allow copy-pasting the displayed diff into 'patch -i -' (or, presumably, any other patch-aware tools which expect "--- %(filename)s\t%(label)s\n" headers). Apologies if this has been discussed and I missed it. Daniel
