Hello!
In the 1.9.1 documentation the %fname/%nqfname description is still switched between the diff viewer and the merge chapter.
IMHO it should be
English, TSVN 1.9.1, chapter 4.30.5.1 (Diff Viewer):
%fname
The name of the file. This is an empty string if two different files are diffed instead of two states of the same file.
%nqfname
The name of the file, without quotes
English, TSVN 1.9.1, chapter 4.30.5.2 (merge tool)
%fname
The name of the conflicted file
%nqfname
The name of the conflicted file, without quotes
German, TSVN 1.9.1, chapter 4.30.5.1. Vergleichsprogramm:
%fname
Der Name der Datei. Dies ist eine leere Zeichenfolge, wenn zwei verschiedene Dateien, anstelle von zwei
Zuständen der selben Datei verglichen werden.
%nqfname
Der Name der Datei, ohne Anführungszeichen
German, TSVN 1.9.1., chapter 4.30.5.2. Konflikteditor
%fname
Der Name der Konfliktdatei in Anführungszeichen
%nqfname
Der Name der Konflikdatei ohne Anführungszeichen
Please correct this.
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
mailto:hartmut.niemann_at_siemens.com
Von: Niemann, Hartmut [mailto:hartmut.niemann_at_siemens.com]
Gesendet: Dienstag, 4. August 2015 18:04
An: users_at_tortoisesvn.tigris.org
Betreff: Documentation errors in the german and english nightly doc regarding %fname?
Hello Stefan!
I conduct experiments with custom differs and found the %fname parameter.
http://tortoisesvn.net/docs/nightly/TortoiseSVN_de/tsvn-dug-settings.html
Is this a feature not yet in 1.8.11? It looks like this doesn't work here but would solve my current problem :-)
There seems to be some mixup in the German documentation,
because %fname is "Name der Konfliktdatei" not only in the section
"Konflikteditor" but also in "Vergleichsprogram" where "Konfliktdatei" doesnt
sound appropriate, does it? I suggest "Name der Datei"
In the english file, the texts are different, but seem switched.
In the "Merge Tool" section it is "The name of the file."
In the Diff Viewer section it is "The name of the conflicted file"
This should be vice versa.
Maybe you could at a note that %base and %mine might be a temporary file name,
so it would be a bad idea to call some basename()-type function on it, but one
should use %fname as the user-visible name of the file in question.
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_at_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=3138934
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-09-22 12:51:10 CEST