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

Custom diff3 command

From: Arpe, Kevin C <Kevin.C.Arpe_at_jpmorgan.com>
Date: Mon, 20 Jun 2011 11:30:39 +0800

Hi, I am a Subversion command-line tools user on Windows XP. Version string = svn, version 1.6.12 (r955767) / compiled Jun 21 2010, 16:00:59 I wrote my own diff3 command batch file. We use it on my team to redirect merges thru KDiff3. I have noticed the argument list is not very descriptive. I will follow GNU diff3 terminology: MYFILE, OLDFILE, YOURFILE. Here are the arguments that my diff3 batch files receives: (These arguments seem to follow the GNU diff3 argument style.) 1) -E 2) -m 3) -L 4) .working 5) -L 6) .merge-left.rOLD_REVISION 7) -L 8) .merge-right.rYOUR_REVISION 9) /full/path/to/MYFILE 10) /full/path/to/OLDFILE 11) /full/path/to/YOURFILE In the above argument list, the -L values are not descriptive enough. Can we add the filename as a prefix? Example: .working -> MYFILE.working Such that, if MYFILE = biglib.c, then .working -> biglib.c.working Many thanks, Kevin Connor Arpe Hongkong This email is confidential and subject to important disclaimers and conditions including on offers for the purchase or sale of securities, accuracy and completeness of information, viruses, confidentiality, legal privilege, and legal entity disclaimers, available at http://www.jpmorgan.com/pages/disclosures/email.
Received on 2011-06-20 05:31:49 CEST

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