RE: Custom diff3 command
From: Adam Downer <adam.downer_at_ri3k.com>
Date: Mon, 20 Jun 2011 16:39:23 +0100
You will need to write a wrapper script to perform this.
and configure your subversion to kick off your custom wrapper.
Hope this sets you on the right track.
From: Arpe, Kevin C [mailto:Kevin.C.Arpe_at_jpmorgan.com]
I am a Subversion command-line tools user on Windows XP.
Version string = svn, version 1.6.12 (r955767) / compiled Jun 21 2010,
I wrote my own diff3 command batch file. We use it on my team to
I have noticed the argument list is not very descriptive. I will follow
Here are the arguments that my diff3 batch files receives: (These
In the above argument list, the -L values are not descriptive enough.
Example: .working -> MYFILE.working
Such that, if MYFILE = biglib.c, then .working -> biglib.c.working
Kevin Connor Arpe
This email is confidential and subject to important disclaimers and
PLEASE NOTE THAT WE HAVE MOVED.
This e-mail and its attachments are confidential. If you are not the intended recipient of this e-mail message, please telephone or e-mail us immediately, delete this message from your system and do not read, copy, distribute, disclose or otherwise use this e-mail message and any attachments.
Although RI3K believes this e-mail and any attachments to be free of any virus or other defect which may affect your computer, it is the responsibility of the recipient to ensure that it is virus free and RI3K does not accept any responsibility for any loss or damage in any way from its use.
RI3K Limited is a company registered in England no: 3909745. Registered office 4th Floor, Dashwood House, 69 Old Broad Street, London, EC2M 1QS. VAT registration no: 769 0192 07
This is an archived mail posted to the Subversion Users mailing list.