RE: confusion over external svn diff and merge on windows
From: Adam Downer <adam.downer_at_ri3k.com>
Date: Fri, 6 May 2011 11:33:06 +0100
In an attempt to answer my own question I set my diff wrapper script to
The results on my first run were very surprising. I got the kdiff
Checking over my svn config revealed that diff-cmd and diff3-cmd also
With that done I finally get a list of what args are being passed in
So the following is what I discovered the parameters are (in order):
So it seems that svn is passing the 'mine', 'theirs' and 'base' as the
MINE=%7 (project\.svn\tmp\tempfile.2.tmp) Target revision for
So in the end the wrapper script needs to be (for kdiff3):
REM Subversion provides the paths we need as parameters.
REM Call the merge command (change the following line to make sense for
But no Joy with this. The path \tmp\tempfile.1.tmp is causing trouble.
So I hit 'l' to launch external merge prog.
So now I am even more confused. I am still unable to find api docs or
Thanks in advance
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.