[prev in list] [next in list] [prev in thread] [next in thread]
List: tortoisesvn-users
Subject: =?UTF-8?Q?Calling_external_diff_tools:_%brev_and_%y?= =?UTF-8?Q?rev_switched_if_=E2=80=9Cmine=E2=80=
From: "Niemann, Hartmut" <hartmut.niemann () siemens ! com>
Date: 2015-07-20 16:38:46
Message-ID: 1AE3002F400CE4498072DFDF74A843CC1F3EED27 () DEFTHW99EH3MSX ! ww902 ! siemens ! net
[Download RAW message or body]
Hello!
I have an issue with calling an external diff tool:
%brev and %yrev seem to be switched if "mine" is the working copy: brev="WC" and yrev \
is the version I compare to.
Is this a bug?
long version:
I call a simple *.bat file that echoes all parameters
----8<----
@echo base=%1 bname=%2 brev=%3
@echo mine=%4 yname=%5 yrev=%6
----8<----
with
commandline.bat %base %bname %brev %mine %yname %yrev
I compare two revisions
base="C:\Users\e09nemh0\AppData\Local\Temp\Handbuch.pdf-rev33.svn001.tmp.pdf" \
bname="Handbuch.pdf Revision 33" brev="33" \
mine="C:\Users\e09nemh0\AppData\Local\Temp\Handbuch.pdf-rev34.svn003.tmp.pdf" \
yname="Handbuch.pdf Revision 34" yrev="34" This looks OK.
I compare one version (from the log viewer) against the working copy:
base="C:\Users\e09nemh0\AppData\Local\Temp\Handbuch.pdf-rev33.svn002.tmp.pdf" \
bname="Handbuch.pdf Revision 33" brev="WC" \
mine="C:\Sibas32\BETA\SG_DIFF\Handbuch.pdf" yname="Handbuch.pdf : Working Copy" \
yrev="33"
base is a checked-out temporary file, bname matches, but yrev is the revision,
while mine is the current file, yname matches, but brev is "WC".
(Windows 7/64, TortoiseSVN 1.8.11)
Mit freundlichen Grüßen
Dr. Hartmut Niemann
Siemens AG
Mobility
MO MLT LM EN CCI 1
Werner-von-Siemens-Str. 67
91052 Erlangen, Deutschland
Tel.: +49 9131 7-34264
Fax: +49 9131 7-26254
mailto:hartmut.niemann@siemens.com
Siemens Aktiengesellschaft: Vorsitzender des Aufsichtsrats: Gerhard Cromme; Vorstand: \
Joe Kaeser, Vorsitzender; Roland Busch, Lisa Davis, Klaus Helmrich, Janina Kugel, \
Siegfried Russwurm, Ralf P. Thomas; Sitz der Gesellschaft: Berlin und München, \
Deutschland; Registergericht: Berlin Charlottenburg, HRB 12300, München, HRB 6684; \
WEEE-Reg.-Nr. DE 23691322
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3127901
To unsubscribe from this discussion, e-mail: \
[users-unsubscribe@tortoisesvn.tigris.org].
[Attachment #3 (text/html)]
<html xmlns:v="urn:schemas-microsoft-com:vml" \
xmlns:o="urn:schemas-microsoft-com:office:office" \
xmlns:w="urn:schemas-microsoft-com:office:word" \
xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" \
xmlns="http://www.w3.org/TR/REC-html40"> <head>
<meta http-equiv="Content-Type" content="text/html; charset=Windows-1252">
<meta name="Generator" content="Microsoft Word 12 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri","sans-serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
span.E-MailFormatvorlage17
{mso-style-type:personal-compose;
font-family:"Calibri","sans-serif";
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 72.0pt 72.0pt 72.0pt;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="DE" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoNormal">Hello!<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal"><span lang="EN-US">I have an issue with calling an external diff \
tool:<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US"><o:p> </o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US">%brev and %yrev seem to be switched if “mine” is the working copy: \
brev=”WC” and yrev is the version I compare to.<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">Is this a bug?<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">long version:<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">I call a simple *.bat file that echoes all \
parameters<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US">----8<----<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US">@echo base=%1 bname=%2 brev=%3<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">@echo mine=%4 yname=%5 \
yrev=%6<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US">----8<----<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US">with <o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US"> & \
nbsp; \
commandline.bat %base %bname %brev %mine %yname %yrev<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">I compare two revisions<o:p></o:p></span></p> <p \
class="MsoNormal">base="C:\Users\e09nemh0\AppData\Local\Temp\Handbuch.pdf-rev33.svn001.tmp.pdf" \
bname="Handbuch.pdf Revision 33" brev="33"<o:p></o:p></p> <p \
class="MsoNormal">mine="C:\Users\e09nemh0\AppData\Local\Temp\Handbuch.pdf-rev34.svn003.tmp.pdf" \
yname="Handbuch.pdf Revision 34" yrev="34"<o:p></o:p></p> <p \
class="MsoNormal"><span lang="EN-US">This looks OK.<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US">I compare one version (from the log viewer) \
against the working copy:<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US"></span>base="C:\Users\e09nemh0\AppData\Local\Temp\Handbuch.pdf-rev33.svn002.tmp.pdf" \
bname="Handbuch.pdf Revision 33" brev="WC"<o:p></o:p></p> <p \
class="MsoNormal"><span \
lang="EN-US">mine="C:\Sibas32\BETA\SG_DIFF\Handbuch.pdf" \
yname="Handbuch.pdf : Working Copy" \
yrev="33"<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US"><o:p> </o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US">base is a checked-out temporary file, bname matches, but yrev is the \
revision, <o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">while mine is the current file, yname \
matches, but brev is “WC”.<o:p></o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US"><o:p> </o:p></span></p> <p class="MsoNormal"><span \
lang="EN-US">(Windows 7/64, TortoiseSVN 1.8.11)<o:p></o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p> <p \
class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p> <p \
class="MsoNormal"><span \
style="font-size:10.0pt;font-family:"Arial","sans-serif"">Mit \
freundlichen Grüßen<br> Dr. Hartmut Niemann<br>
<br>
Siemens AG<br>
Mobility<br>
MO MLT LM EN CCI 1<br>
Werner-von-Siemens-Str. 67<br>
91052 Erlangen, Deutschland<br>
Tel.: +49 9131 7-34264<br>
Fax: +49 9131 7-26254<br>
<a href="mailto:hartmut.niemann@siemens.com"><span \
style="color:blue">mailto:hartmut.niemann@siemens.com</span></a><br> <br>
</span><span style="font-size:8.0pt;font-family:"Arial","sans-serif"">Siemens \
Aktiengesellschaft: Vorsitzender des Aufsichtsrats: Gerhard Cromme; Vorstand: Joe \
Kaeser, Vorsitzender; Roland Busch, Lisa Davis, Klaus Helmrich, Janina Kugel, \
Siegfried Russwurm, Ralf P. Thomas; Sitz der Gesellschaft: Berlin und München, \
Deutschland; Registergericht: Berlin Charlottenburg, HRB 12300, München, HRB 6684; \
WEEE-Reg.-Nr. DE 23691322</span><o:p></o:p></p> </div>
</body>
</html>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic