On May 4, 2011, at 12:31 , Adam Downer wrote:
> Dear list,
>
> I am on windows and I am trying to use svn 1.6 on a cygwin command line to perform a merge of some code.
> I would also like to use the windows version of kdiff3 to help me out on this.
>
> I have read the book on this:
> http://svnbook.red-bean.com/en/1.5/svn.advanced.externaldifftools.html
> and I have searched the mailing list on how to set this up. But I have met with conflicting information on
> what and how the parameters are passed to kdiff3 from svn merge.
>
> I have a wrapper script specified in my svn config:
> merge-tool-cmd = "C:\diffWrapper.bat"
>
> the contents of diffWrapper.bat is as per:
> http://svnbook.red-bean.com/en/1.5/svn.advanced.externaldifftools.html#svn.advanced.externaldifftools.diff3.ex-2
>
> extended with a “type” and ‘exit 0’ command.
>
> But this does not seem to produce the desired result and the merge tool does not give me the resolved
> option when I exit kdiff3.
A glance at the man page for kdiff3 shows that it expects the three
files on the command line without options given in the SVN Book's
sample diff wrapper.
http://linux.die.net/man/1/kdiff3
Try changing
%DIFF3% --older %OLDER% --mine %MINE% --yours %YOURS%
to
%DIFF3% %OLDER% %MINE% %YOURS%
Steve
> I have read some list posts which state that svn merge specifies the output file for merge operations making
> the ‘cat’ at the end of the script unnecessary. Is this true? (sorry no ref available)
>
> I have tried to look up the svn merge behaviour but have so far come up empty.
> Can someone confirm the list of passed variables and their order for the merge tool.
>
> Thanks in advance
>
> Adam D
>
> ________________________________________________________________________
>
> PLEASE NOTE THAT WE HAVE MOVED.
> Our new address is 4th Floor, Dashwood House, 69 Old Broad Street, London, EC2M 1QS. Our new telephone number is +44 (0) 20 3535 8300.
>
> 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
--
Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
tel: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
Received on 2011-05-04 13:09:30 CEST