You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by "Arpe, Kevin C" <Ke...@jpmorgan.com> on 2011/06/20 05:30:39 UTC
Custom diff3 command
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.
RE: Custom diff3 command
Posted by Adam Downer <ad...@ri3k.com>.
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: Adam Downer [mailto:adam.downer@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 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.
Hope this sets you on the right track.
Adam D
From: Arpe, Kevin C [mailto:Kevin.C.Arpe@jpmorgan.com]
Sent: 20 June 2011 04:31
To: users@subversion.apache.org
Subject: Custom diff3 command
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.
________________________________________________________________________
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
________________________________________________________________________
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
RE: Custom diff3 command
Posted by Adam Downer <ad...@ri3k.com>.
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.downer@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 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.
Hope this sets you on the right track.
Adam D
From: Arpe, Kevin C [mailto:Kevin.C.Arpe@jpmorgan.com]
Sent: 20 June 2011 04:31
To: users@subversion.apache.org
Subject: Custom diff3 command
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.
________________________________________________________________________
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
________________________________________________________________________
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
RE: Custom diff3 command
Posted by Adam Downer <ad...@ri3k.com>.
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.
Hope this sets you on the right track.
Adam D
From: Arpe, Kevin C [mailto:Kevin.C.Arpe@jpmorgan.com]
Sent: 20 June 2011 04:31
To: users@subversion.apache.org
Subject: Custom diff3 command
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.
________________________________________________________________________
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