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.externaldifftool
Ahh yes, I should have mentioned that I have tried this change already.
Oops.
Removing the "--" parameters passing to diff3 performs a three-way diff
of the files passed. I am after a three way merge, so this would be more
like what I am needing to specify.
%DIFF3% %BASE% %MINE% %YOURS% -o %RESUL
>
> If you just run 'kdiff3' from the shell prompt, do you get another
shell
> prompt before or after you close diff3?
>
> It should be the latter.
Good thought, it is the latter.
PLEASE NOTE THAT WE HAVE MOVED.
Our new a
In an attempt to answer my own question I set my diff wrapper script to
simply echo the arguments passed to it into a txt file. I am aware that
in windows I only have access to the first nine args at a time. So I
echo args 1 - 9 and then shifted 9 times and echoed all 9 args again
(just to make sur
You will need to write a wrapper script to perform this.
Start here
http://svnbook.red-bean.com/en/1.5/svn.advanced.externaldifftools.html
and configure your subversion to kick off your custom wrapper.
Manipulate the passed in args as you want them and output them to your
diff prog.
Ho
Nope, besides, it will be a suitable send off for Jira to cause you a
final bit of pain in using it J
From: Adam Downer [mailto:adam.dow...@ri3k.com]
Sent: 20 June 2011 16:39
To: Arpe, Kevin C; users@subversion.apache.org
Subject: RE: Custom diff3 command
You will need to write a wrapper
Apologies, responded to wrong email L
From: Adam Downer
Sent: 26 July 2011 14:03
To: Adam Downer; Arpe, Kevin C; users@subversion.apache.org
Subject: RE: Custom diff3 command
Nope, besides, it will be a suitable send off for Jira to cause you a
final bit of pain in using it J
From
