[svnbook] r4784 committed - Fixed screen output.
svnbook at googlecode.com
svnbook at googlecode.com
Fri May 9 07:00:50 CDT 2014
Revision: 4784
Author: jmfelderhoff at gmx.eu
Date: Fri May 9 12:00:28 2014 UTC
Log: Fixed screen output.
http://code.google.com/p/svnbook/source/detail?r=4784
Modified:
/branches/1.7/de/book/ch01-fundamental-concepts.xml
/branches/1.7/de/book/ch02-basic-usage.xml
/branches/1.7/de/book/ch03-advanced-topics.xml
/branches/1.7/de/book/ch04-branching-and-merging.xml
=======================================
--- /branches/1.7/de/book/ch01-fundamental-concepts.xml Wed May 7 11:45:46
2014 UTC
+++ /branches/1.7/de/book/ch01-fundamental-concepts.xml Fri May 9 12:00:28
2014 UTC
@@ -1659,8 +1659,7 @@
$ svn checkout http://svn.example.com/repos/calc
A calc/Makefile
A calc/integer.c
-A calc/button.c
-<!--
+A calc/button.c <!--
Checked out revision 56.
-->
Ausgecheckt, Revision 56.
@@ -1743,8 +1742,7 @@
<informalexample>
<screen>
-$ svn commit button.c -m "Fixed a typo in button.c."
-<!--
+$ svn commit button.c -m "Fixed a typo in button.c." <!--
Sending button.c
Transmitting file data .
Committed revision 57.
@@ -1834,8 +1832,7 @@
Makefile button.c integer.c .svn/
$ svn update
Updating '.':
-U button.c
-<!--
+U button.c <!--
Updated to revision 57.
-->
Aktualisiert zu Revision 57.
=======================================
--- /branches/1.7/de/book/ch02-basic-usage.xml Mon Mar 10 20:55:58 2014 UTC
+++ /branches/1.7/de/book/ch02-basic-usage.xml Fri May 9 12:00:28 2014 UTC
@@ -134,8 +134,7 @@
<informalexample>
<screen>
-$ svn help
-<!--
+$ svn help <!--
Subversion command-line client, version 1.6.13.
Type 'svn help <subcommand>' for help on a specific subcommand.
Type 'svn - -version' to see the program version and RA modules
@@ -183,8 +182,7 @@
<informalexample>
<screen>
-$ svn help help
-<!--
+$ svn help help <!--
help (?, h): Describe the usage of this program or its subcommands.
usage: help [SUBCOMMAND...]
@@ -365,9 +363,8 @@
<informalexample>
<screen>
-<!--
$ svn import /path/to/mytree \
- http://svn.example.com/svn/repo/some/project \
+ http://svn.example.com/svn/repo/some/project \ <!--
-m "Initial import"
Adding mytree/foo.c
Adding mytree/bar.c
@@ -376,9 +373,6 @@
Committed revision 1.
-->
-$ svn import mytree file:///var/svn/newrepos/some/project \
- http://svn.example.com/svn/repo/some/project \
- -m "Erstimport"
Hinzufügen mytree/foo.c
Hinzufügen mytree/bar.c
Hinzufügen mytree/subdir
@@ -711,8 +705,7 @@
A trunk/INSTALL
A trunk/src/main.c
A trunk/src/header.h
-…
-<!--
+… <!--
Checked out revision 8810.
-->
Ausgecheckt, Revision 8810.
@@ -739,8 +732,7 @@
A src/main.c
A src/header.h
A src/lib/helpers.c
-…
-<!--
+… <!--
Checked out revision 8810.
-->
Ausgecheckt, Revision 8810.
@@ -865,8 +857,7 @@
A my-working-copy/INSTALL
A my-working-copy/src/main.c
A my-working-copy/src/header.h
-…
-<!--
+… <!--
Checked out revision 8810.
-->
Ausgecheckt, Revision 8810.
@@ -1074,8 +1065,7 @@
$ svn update
Updating '.':
U foo.c
-U bar.c
-<!--
+U bar.c <!--
Updated to revision 2.
-->
Aktualisiert zu Revision 2.
@@ -1873,8 +1863,7 @@
M 44 20 harry bar.c
* 44 35 harry stuff/trout.c
D 44 19 ira stuff/fish.c
-A 0 ? ? stuff/things/bloo.h
-<!--
+A 0 ? ? stuff/things/bloo.h <!--
Status against revision: 46
-->
Status bezogen auf Revision: 46
@@ -2183,8 +2172,7 @@
<screen>
$ svn status README
M README
-$ svn revert README
-<!--
+$ svn revert README <!--
Reverted 'README'
-->
Rückgängig gemacht: »README«
@@ -2217,8 +2205,7 @@
? new-file.txt
$ svn add new-file.txt
A new-file.txt
-$ svn revert new-file.txt
-<!--
+$ svn revert new-file.txt <!--
Reverted 'new-file.txt'
-->
Rückgängig gemacht: »new-file.txt«
@@ -2242,8 +2229,7 @@
$ svn delete README
D README
-$ svn revert README
-<!--
+$ svn revert README <!--
Reverted 'README'
-->
Rückgängig gemacht: »README«
@@ -2326,8 +2312,7 @@
$ svn update
Updating '.':
U INSTALL
-G README
-<!--
+G README <!--
Conflict discovered in 'bar.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
@@ -2396,8 +2381,7 @@
eintippen:</para>
<informalexample>
<screen>
-…
-<!--
+… <!--
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: s
@@ -2699,8 +2683,7 @@
<informalexample>
<screen>
-…
-<!--
+… <!--
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: df
@@ -3122,8 +3105,7 @@
<screen>
$ svn update
Updating '.':
-Conflict discovered in 'sandwich.txt'.
-<!--
+Conflict discovered in 'sandwich.txt'. <!--
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
@@ -3132,8 +3114,7 @@
Auswahl: (p) zurückstellen, (df) voller Diff, (e) editieren,
(mc) eigene konfliktbehaftete Datei, (tc) fremde
konfliktbehaftete Datei
(s) alle Optionen anzeigen: p
-C sandwich.txt
-<!--
+C sandwich.txt <!--
Updated to revision 2.
Summary of conflicts:
Text conflicts: 1
@@ -3163,8 +3144,7 @@
<informalexample>
<screen>
-$ svn commit -m "Add a few more things"
-<!--
+$ svn commit -m "Add a few more things" <!--
svn: E155015: Commit failed (details follow):
svn: E155015: Aborting commit: '/home/sally/svn-work/sandwich.txt' remains
in conflict
-->
@@ -3246,8 +3226,7 @@
<informalexample>
<screen>
-$ svn resolve --accept working sandwich.txt
-<!--
+$ svn resolve --accept working sandwich.txt <!--
Resolved conflicted state of 'sandwich.txt'
-->
Konflikt von »sandwich.txt« aufgelöst
@@ -3418,8 +3397,7 @@
<informalexample>
<screen>
-$ svn resolve --accept working sandwich.txt
-<!--
+$ svn resolve --accept working sandwich.txt <!--
Resolved conflicted state of 'sandwich.txt'
$ svn commit -m "Go ahead and use my sandwich, discarding Sally's edits."
-->
@@ -3559,8 +3537,7 @@
<informalexample>
<screen>
-$ svn revert sandwich.txt
-<!--
+$ svn revert sandwich.txt <!--
Reverted 'sandwich.txt'
-->
Rückgängig gemacht: »sandwich.txt«
@@ -3618,8 +3595,7 @@
<informalexample>
<screen>
-$ svn commit -m "Corrected number of cheese slices."
-<!--
+$ svn commit -m "Corrected number of cheese slices." <!--
Sending sandwich.txt
Transmitting file data .
Committed revision 3.
@@ -3645,8 +3621,7 @@
<informalexample>
<screen>
-$ svn commit -F logmsg
-<!--
+$ svn commit -F logmsg <!--
Sending sandwich.txt
Transmitting file data .
Committed revision 4.
@@ -3692,8 +3667,7 @@
<informalexample>
<screen>
-$ svn commit
-<!--
+$ svn commit <!--
Waiting for Emacs...Done
Log message unchanged or not specified
@@ -3725,8 +3699,7 @@
mehrere Ihrer Dateien nicht mehr aktuell sind:</para>
<informalexample>
- <screen>
-<!--
+ <screen> <!--
$ svn commit -m "Add another rule"
Sending rules.txt
svn: E155011: Commit failed (details follow):
@@ -4136,29 +4109,31 @@
<informalexample>
<screen>
$ svn log
-------------------------------------------------------------------------
+------------------------------------------------------------------------
<!--
r3 | sally | 2008-05-15 23:09:28 -0500 (Thu, 15 May 2008) | 1 line
-<!--
Added include lines and corrected # of cheese slices.
-->
+r3 | sally | 2008-05-15 23:09:28 -0500 (Do, 15. Mai 2008) | 1 Zeile
+
include-Zeilen hinzugefügt und Anzahl der Käsescheiben korrigiert.
-------------------------------------------------------------------------
+------------------------------------------------------------------------
<!--
r2 | harry | 2008-05-14 18:43:15 -0500 (Wed, 14 May 2008) | 1 line
-<!--
Added main() methods.
-->
+r2 | harry | 2008-05-14 18:43:15 -0500 (Mi, 14. Mai 2008) | 1 Zeile
+
main()-Methoden hinzugefügt.
-------------------------------------------------------------------------
+------------------------------------------------------------------------
<!--
r1 | sally | 2008-05-10 19:50:31 -0500 (Sat, 10 May 2008) | 1 line
-<!--
Initial import
-->
+r1 | sally | 2008-05-10 19:50:31 -0500 (Sa, 10. Mai 2008) | 1 Zeile
+
Erstimport
------------------------------------------------------------------------
--->
</screen>
</informalexample>
@@ -4326,16 +4301,17 @@
<informalexample>
<screen>
$ svn log -r 8 -v
-------------------------------------------------------------------------
+------------------------------------------------------------------------
<!--
r8 | sally | 2008-05-21 13:19:25 -0500 (Wed, 21 May 2008) | 1 line
-<!--
+
Changed paths:
-->
+r8 | sally | 2008-05-21 13:19:25 -0500 (Mi, 21. Mai 2008) | 1 Zeile
+
Geänderte Pfade:
M /trunk/code/foo.c
M /trunk/code/bar.h
A /trunk/code/doc/README
-
<!--
Frozzled the sub-space winch.
-->
@@ -4648,8 +4624,7 @@
<informalexample>
<screen>
-$ svn annotate images/logo.png
-<!--
+$ svn annotate images/logo.png <!--
Skipping binary file: 'images/logo.png'
-->
Überspringe Binärdatei: »images/logo.png«
@@ -4832,8 +4807,7 @@
Zeitmaschine sei.</para></footnote></para>
<informalexample>
- <screen>
-<!--
+ <screen> <!--
# Make the current directory look like it did in r1729.
-->
# Lass das aktuelle Verzeichnis aussehen wie in r1729.
@@ -4890,14 +4864,12 @@
angeben.</para>
<informalexample>
- <screen>
-<!--
+ <screen> <!--
# Checkout the trunk from r1729.
-->
# Den Trunk von r1729 auschecken.
$ svn checkout http://svn.example.com/svn/repo/trunk@1729 trunk-1729
-…
-<!--
+… <!--
# Checkout the current trunk as it looked in r1729.
-->
# Den aktuellen Trunk auschecken, wie er in r1729 aussah.
@@ -4926,20 +4898,17 @@
checkout</command>:</para>
<informalexample>
- <screen>
-<!--
+ <screen> <!--
# Export the trunk from the latest revision.
-->
# Den Trunk aus der letzten Revision exportieren.
$ svn export http://svn.example.com/svn/repo/trunk trunk-export
-…
-<!--
+… <!--
# Export the trunk from r1729.
-->
# Den Trunk aus r1729 exportieren.
$ svn export http://svn.example.com/svn/repo/trunk@1729 trunk-1729
-…
-<!--
+… <!--
# Export the current trunk as it looked in r1729.
-->
# Den aktuellen Trunk exportieren, wie er in in r1729 aussah.
@@ -5344,8 +5313,7 @@
<informalexample>
<screen>
-$ svn commit -m "Small fixes"
-<!--
+$ svn commit -m "Small fixes" <!--
Sending code/bar.c
svn: E155011: Commit failed (details follow):
svn: E155011: File '/home/svn/project/code/bar.c' is out of date
@@ -5379,8 +5347,7 @@
Updating '.':
C code/bar.c
A code/baz.c
-U Makefile
-<!--
+U Makefile <!--
Updated to revision 14.
Summary of conflicts:
Tree conflicts: 1
@@ -5407,8 +5374,7 @@
$ svn status
M code/foo.c
A + C code/bar.c
- > local edit, incoming delete upon update
-<!--
+ > local edit, incoming delete upon update <!--
Summary of conflicts:
Tree conflicts: 1
-->
@@ -5470,11 +5436,12 @@
<informalexample>
<screen>
$ svn log -r14 ^/trunk
-------------------------------------------------------------------------
+------------------------------------------------------------------------
<!--
r14 | harry | 2011-09-06 10:38:17 -0400 (Tue, 06 Sep 2011) | 1 line
-<!--
+
Changed paths:
-->
+r14 | harry | 2011-09-06 10:38:17 -0400 (Di, 06. Sep 2011) | 1 Zeile
Geänderte Pfade:
M /Makefile
D /code/bar.c
@@ -5533,15 +5500,13 @@
<informalexample>
<screen>
-$ svn info code/bar.c
-<!--
+$ svn info code/bar.c <!--
Path: code/bar.c
-->
Pfad: code/bar.c
Name: bar.c
URL: http://svn.example.com/svn/repo/trunk/code/bar.c
-…
-<!--
+… <!--
Tree conflict: local edit, incoming delete upon update
Source left: (file) ^/trunk/code/bar.c at 4
Source right: (none) ^/trunk/code/bar.c at 5
@@ -5566,8 +5531,7 @@
<informalexample>
<screen>
-$ svn commit -m "Small fixes"
-<!--
+$ svn commit -m "Small fixes" <!--
svn: E155015: Commit failed (details follow):
svn: E155015: Aborting commit: '/home/svn/project/code/bar.c' remains in
confl
ict
@@ -5655,8 +5619,7 @@
{
- return "Me neither!\n";
+ return "Well, I do like being moved around!\n";
- }
-<!--
+ } <!--
$ ### Edit PATCHFILE to refer to code/baz.c instead of code/bar.c
-->
$ ### PATCHFILE bearbeiten, so dass es sich auf code/baz.c statt auf
code/bar.c bezieht
@@ -5697,8 +5660,7 @@
<screen>
$ svn delete --force code/bar.c
D code/bar.c
-$ svn resolve --accept=working code/bar.c
-<!--
+$ svn resolve --accept=working code/bar.c <!--
Resolved conflicted state of 'code/bar.c'
-->
Konflikt von »code/bar.c« aufgelöst
@@ -5756,8 +5718,7 @@
<screen>
$ svn delete --force code/baz.c
D code/baz.c
-$ svn resolve --accept=working code/bar.c
-<!--
+$ svn resolve --accept=working code/bar.c <!--
Resolved conflicted state of 'code/bar.c'
-->
Konflikt von »code/bar.c« aufgelöst
=======================================
--- /branches/1.7/de/book/ch03-advanced-topics.xml Wed May 7 11:45:46 2014
UTC
+++ /branches/1.7/de/book/ch03-advanced-topics.xml Fri May 9 12:00:28 2014
UTC
@@ -335,52 +335,45 @@
<informalexample>
<screen>
-$ svn diff -r PREV:COMMITTED foo.c
-<!--
+$ svn diff -r PREV:COMMITTED foo.c <!--
# shows the last change committed to foo.c
-->
# zeigt die letzte übergebene Änderung von foo.c an
-$ svn log -r HEAD
-<!--
+$ svn log -r HEAD <!--
# shows log message for the latest repository commit
-->
# gibt die Protokollnachricht der letzten Übergabe an das
# Projektarchiv aus
-$ svn diff -r HEAD
-<!--
+$ svn diff -r HEAD <!--
# compares your working copy (with all of its local changes) to the
# latest version of that tree in the repository
-->
# vergleicht Ihre Arbeitskopie (mit allen lokalen Änderungen) mit der
# letzten Version dieses Baums im Projektarchiv
-$ svn diff -r BASE:HEAD foo.c
-<!--
+$ svn diff -r BASE:HEAD foo.c <!--
# compares the unmodified version of foo.c with the latest version of
# foo.c in the repository
-->
# vergleicht die unmodifizierte Version von foo.c mit der letzten
# Version von foo.c im Projektarchiv
-$ svn log -r BASE:HEAD
-<!--
+$ svn log -r BASE:HEAD <!--
# shows all commit logs for the current versioned directory since you
# last updated
-->
# gibt alle Übergabe-Protokollnachrichten des aktuellen versionierten
# Verzeichnisses seit der letzten Aktualisierung aus
-$ svn update -r PREV foo.c
-<!--
+$ svn update -r PREV foo.c <!--
# rewinds the last change on foo.c, decreasing foo.c's working revision
-->
# macht die letzte Änderung an foo.c rückgängig, indem die
# Arbeitsrevision von foo.c vermindert wird
-$ svn diff -r BASE:14 foo.c
-<!--
+$ svn diff -r BASE:14 foo.c <!--
# compares the unmodified version of foo.c with the way foo.c looked
# in revision 14
-->
@@ -477,8 +470,10 @@
<informalexample>
<screen>
$ svn log -r {2006-11-28}
-------------------------------------------------------------------------
+------------------------------------------------------------------------
<!--
r12 | ira | 2006-11-27 12:31:51 -0600 (Mon, 27 Nov 2006) | 6 lines
+-->
+r12 | ira | 2006-11-27 12:31:51 -0600 (Mo, 27. Nov 2006) | 6 Zeilen
…
</screen>
</informalexample>
@@ -1049,8 +1044,7 @@
<informalexample>
<screen>
-$ svn cat -r 1 concept/IDEA
-<!--
+$ svn cat -r 1 concept/IDEA <!--
svn: E195012: Unable to find repository location for 'concept/IDEA' in
revision 1
-->
svn: E195012: Kann »concept/IDEA« in Revision 1 nicht im Projektarchiv
finden
@@ -1072,8 +1066,7 @@
<informalexample>
<screen>
-$ svn cat -r 1 concept/IDEA at BASE
-<!--
+$ svn cat -r 1 concept/IDEA at BASE <!--
svn: E195012: Unable to find repository location for 'concept/IDEA' in
revision 1
-->
svn: E195012: Kann »concept/IDEA« in Revision 1 nicht im Projektarchiv
finden
@@ -1605,8 +1598,7 @@
<informalexample>
<screen>
$ svn commit -m "Fix up the last remaining known regression bug." \
- --with-revprop "test-results=all passing"
-<!--
+ --with-revprop "test-results=all passing" <!--
Sending lib/crit_bits.c
Transmitting file data .
Committed revision 912.
@@ -1773,8 +1765,7 @@
<informalexample>
<screen>
-$ svn propset copyright '(c) 2006 Red-Bean Software' calc/button.c
-<!--
+$ svn propset copyright '(c) 2006 Red-Bean Software' calc/button.c <!--
property 'copyright' set on 'calc/button.c'
-->
Eigenschaft »copyright« für »calc/button.c« gesetzt
@@ -1804,8 +1795,7 @@
<informalexample>
<screen>
-$ svn propset license -F /path/to/LICENSE calc/button.c
-<!--
+$ svn propset license -F /path/to/LICENSE calc/button.c <!--
property 'license' set on 'calc/button.c'
-->
Eigenschaft »license« für »calc/button.c« gesetzt
@@ -1869,8 +1859,7 @@
<informalexample>
<screen>
-$ svn propedit copyright calc/button.c ### exit the editor without changes
-<!--
+$ svn propedit copyright calc/button.c ### exit the editor without
changes <!--
No changes to property 'copyright' on 'calc/button.c'
-->
Keine Änderungen der Eigenschaft »copyright« für »calc/button.c«
@@ -1895,8 +1884,7 @@
<informalexample>
<screen>
-$ svn propset copyright '(c) 2006 Red-Bean Software' calc/*
-<!--
+$ svn propset copyright '(c) 2006 Red-Bean Software' calc/* <!--
property 'copyright' set on 'calc/Makefile'
property 'copyright' set on 'calc/button.c'
property 'copyright' set on 'calc/integer.c'
@@ -1937,8 +1925,7 @@
<informalexample>
<screen>
-$ svn proplist calc/button.c
-<!--
+$ svn proplist calc/button.c <!--
Properties on 'calc/button.c':
-->
Eigenschaften zu »calc/button.c«:
@@ -1964,8 +1951,7 @@
<informalexample>
<screen>
-$ svn proplist -v calc/button.c
-<!--
+$ svn proplist -v calc/button.c <!--
Properties on 'calc/button.c':
-->
Eigenschaften zu »calc/button.c«:
@@ -2004,8 +1990,7 @@
<informalexample>
<screen>
-$ svn propset license "" calc/button.c
-<!--
+$ svn propset license "" calc/button.c <!--
property 'license' set on 'calc/button.c'
-->
Eigenschaft »license« für »calc/button.c« gesetzt
@@ -2030,13 +2015,11 @@
<informalexample>
<screen>
-$ svn propdel license calc/button.c
-<!--
+$ svn propdel license calc/button.c <!--
property 'license' deleted from 'calc/button.c'.
-->
Eigenschaft »license« wurde von »calc/button.c« gelöscht.
-$ svn proplist -v calc/button.c
-<!--
+$ svn proplist -v calc/button.c <!--
Properties on 'calc/button.c':
-->
Eigenschaften zu »calc/button.c«:
@@ -2092,8 +2075,7 @@
<informalexample>
<screen>
-$ svn propset svn:log "* button.c: Fix a compiler warning." -r11 --revprop
-<!--
+$ svn propset svn:log "* button.c: Fix a compiler warning." -r11 --revprop
<!--
property 'svn:log' set on repository revision '11'
-->
Eigenschaft »svn:log« wurde für Revision »11« im Projektarchiv gesetzt
@@ -2114,8 +2096,7 @@
<informalexample>
<screen>
$ svn propset svn:log "* button.c: Fix a compiler warning." -r11 --revprop
\
- http://svn.example.com/repos/project
-<!--
+ http://svn.example.com/repos/project <!--
property 'svn:log' set on repository revision '11'
-->
Eigenschaft »svn:log« wurde für Revision »11« im Projektarchiv gesetzt.
@@ -2229,8 +2210,7 @@
<screen>
$ svn status calc/button.c
M calc/button.c
-$ svn diff calc/button.c
-<!--
+$ svn diff calc/button.c <!--
Property changes on: calc/button.c
-->
___________________________________________________________________
@@ -2285,8 +2265,7 @@
<informalexample>
<screen>
$ svn update calc
-M calc/Makefile.in
-<!--
+M calc/Makefile.in <!--
Conflict for property 'linecount' discovered on 'calc/button.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
(s) show all options: p
@@ -2333,8 +2312,7 @@
$ svn status calc
C calc/button.c
? calc/button.c.prej
-$ cat calc/button.c.prej
-<!--
+$ cat calc/button.c.prej <!--
Trying to change property 'linecount' from '1267' to '1301',
but property has been locally changed from '1267' to '1256'.
-->
@@ -3586,8 +3564,7 @@
für verschiedene Dinge:</para>
<informalexample>
- <screen>
-<!--
+ <screen> <!--
$ ls ### the book sources
-->
$ ls ### die Quelltextdateien des Buchs
@@ -3600,8 +3577,7 @@
ch02-basic-usage.xml foreword.xml
ch03-advanced-topics.xml images/
ch04-branching-and-merging.xml index.xml
-ch05-repository-admin.xml styles.css
-<!--
+ch05-repository-admin.xml styles.css <!--
$ ls ch* ### the book chapters
-->
$ ls ch* ### die Kapitel des Buchs
@@ -3610,13 +3586,11 @@
ch02-basic-usage.xml ch08-embedding-svn.xml
ch03-advanced-topics.xml ch09-reference.xml
ch04-branching-and-merging.xml ch10-world-peace-thru-svn.xml
-ch05-repository-admin.xml
-<!--
+ch05-repository-admin.xml <!--
$ ls ch?0-* ### the book chapters whose numbers end in zero
-->
$ ls ch?0-* ### die Kapitel, deren Namen auf Null enden
-ch00-preface.xml ch10-world-peace-thru-svn.xml
-<!--
+ch00-preface.xml ch10-world-peace-thru-svn.xml <!--
$ ls ch0[3578]-* ### the book chapters that Mike is responsible for
-->
$ ls ch0[3578]-* ### die Kapitel, für die Mike zuständig ist
@@ -3732,8 +3706,7 @@
<informalexample>
<screen>
-$ svn propset svn:ignore -F .cvsignore .
-<!--
+$ svn propset svn:ignore -F .cvsignore . <!--
property 'svn:ignore' set on '.'
-->
Eigenschaft »svn:ignore« für ».« gesetzt
@@ -4313,8 +4286,7 @@
<informalexample>
<screen>
-$ svn propset svn:keywords "Date Author" weather.txt
-<!--
+$ svn propset svn:keywords "Date Author" weather.txt <!--
property 'svn:keywords' set on 'weather.txt'
-->
Eigenschaft »svn:keywords« für »weather.txt« gesetzt
@@ -4750,8 +4722,7 @@
A mom/daughter/granddaughter2
A mom/daughter/fishie.txt
A mom/kitty1.txt
-A mom/doggie1.txt
-<!--
+A mom/doggie1.txt <!--
Checked out revision 1.
-->
Ausgecheckt, Revision 1.
@@ -4770,8 +4741,7 @@
<informalexample>
<screen>
-$ svn checkout file:///var/svn/repos mom-empty --depth empty
-<!--
+$ svn checkout file:///var/svn/repos mom-empty --depth empty <!--
Checked out revision 1
-->
Ausgecheckt, Revision 1
@@ -4913,8 +4883,7 @@
<informalexample>
<screen>
-$ svn info mom-immediates | grep "^Depth:"
-<!--
+$ svn info mom-immediates | grep "^Depth:" <!--
Depth: immediates
-->
Tiefe: immediates
@@ -4938,8 +4907,7 @@
<screen>
$ svn checkout file:///var/svn/repos mom-files --depth files
A mom-files/kitty1.txt
-A mom-files/doggie1.txt
-<!--
+A mom-files/doggie1.txt <!--
Checked out revision 1.
-->
Ausgecheckt. Revision 1.
@@ -4947,8 +4915,7 @@
A mom-immediates/son
A mom-immediates/daughter
A mom-immediates/kitty1.txt
-A mom-immediates/doggie1.txt
-<!--
+A mom-immediates/doggie1.txt <!--
Checked out revision 1.
-->
Ausgecheckt. Revision 1.
@@ -5028,16 +4995,14 @@
$ svn update --set-depth files mom-empty
Updating 'mom-empty':
A mom-empty/kittie1.txt
-A mom-empty/doggie1.txt
-<!--
+A mom-empty/doggie1.txt <!--
Updated to revision 1.
-->
Aktualisiert zu Revision 1.
$ svn update --set-depth immediates mom-empty
Updating 'mom-empty':
A mom-empty/son
-A mom-empty/daughter
-<!--
+A mom-empty/daughter <!--
Updated to revision 1.
-->
Aktualisiert zu Revision 1.
@@ -5048,8 +5013,7 @@
A mom-empty/daughter/granddaughter1/bunny1.txt
A mom-empty/daughter/granddaughter1/bunny2.txt
A mom-empty/daughter/granddaughter2
-A mom-empty/daughter/fishie1.txt
-<!--
+A mom-empty/daughter/fishie1.txt <!--
Updated to revision 1.
-->
Aktualisiert zu Revision 1.
@@ -5093,22 +5057,19 @@
<informalexample>
<screen>
$ rm -rf mom-empty
-$ svn checkout file:///var/svn/repos mom-empty --depth empty
-<!--
+$ svn checkout file:///var/svn/repos mom-empty --depth empty <!--
Checked out revision 1.
-->
Ausgecheckt. Revision 1.
$ svn update --set-depth empty mom-empty/son
Updating 'mom-empty/son':
-A mom-empty/son
-<!--
+A mom-empty/son <!--
Updated to revision 1.
-->
Aktualisiert zu Revision 1.
$ svn update --set-depth empty mom-empty/daughter
Updating 'mom-empty/daughter':
-A mom-empty/daughter
-<!--
+A mom-empty/daughter <!--
Updated to revision 1.
-->
Aktualisiert zu Revision 1.
@@ -5116,8 +5077,7 @@
Updating 'mom-empty/daughter/granddaughter1':
A mom-empty/daughter/granddaughter1
A mom-empty/daughter/granddaughter1/bunny1.txt
-A mom-empty/daughter/granddaughter1/bunny2.txt
-<!--
+A mom-empty/daughter/granddaughter1/bunny2.txt <!--
Updated to revision 1.
-->
Aktualisiert zu Revision 1.
@@ -5267,8 +5227,7 @@
$ svn update --set-depth infinity many-dirs/wanted-dir-2
…
$ svn update --set-depth infinity many-dirs/wanted-dir-3
-…
-<!--
+… <!--
### and so on, and so on, ...
-->
### usw., usw., ...
@@ -5870,8 +5829,7 @@
$ svn status
K banana.jpg
-$ svn info banana.jpg
-<!--
+$ svn info banana.jpg <!--
Path: banana.jpg
Name: banana.jpg
Working Copy Root Path: /home/harry/project
@@ -6011,8 +5969,7 @@
<screen>
$ svn delete banana.jpg
D banana.jpg
-$ svn commit -m "Delete useless file."
-<!--
+$ svn commit -m "Delete useless file." <!--
Deleting banana.jpg
svn: E175002: Commit failed (details follow):
svn: E175002: Server sent unexpected return value (423 Locked) in response
to
@@ -6044,8 +6001,7 @@
<screen>
$ svn status
M K banana.jpg
-$ svn commit -m "Make banana more yellow"
-<!--
+$ svn commit -m "Make banana more yellow" <!--
Sending banana.jpg
Transmitting file data .
Committed revision 2201.
@@ -6128,8 +6084,7 @@
<informalexample>
<screen>
-$ svn unlock banana.c
-<!--
+$ svn unlock banana.c <!--
'banana.c' unlocked.
-->
»banana.c« freigegeben.
@@ -6161,8 +6116,7 @@
$ svn status -u
M 23 bar.c
M O 32 raisin.jpg
- * 72 foo.h
-<!--
+ * 72 foo.h <!--
Status against revision: 105
-->
Status bezogen auf Revision: 105
@@ -6197,8 +6151,7 @@
<informalexample>
<screen>
-$ svn info ^/raisin.jpg
-<!--
+$ svn info ^/raisin.jpg <!--
Path: raisin.jpg
Name: raisin.jpg
URL: http://svn.example.com/repos/project/raisin.jpg
@@ -6323,8 +6276,7 @@
<informalexample>
<screen>
-$ svnadmin lslocks /var/svn/repos
-<!--
+$ svnadmin lslocks /var/svn/repos <!--
Path: /project2/images/banana.jpg
UUID Token: opaquelocktoken:c32b4d88-e8fb-2310-abb3-153ff1236923
Owner: frank
@@ -6339,7 +6291,6 @@
Läuft ab:
Kommentar (1 Zeile):
Still improving the yellow color.
-
<!--
Path: /project/raisin.jpg
UUID Token: opaquelocktoken:fc2b4dee-98f9-0310-abf3-653ff3226e6b
@@ -6356,8 +6307,7 @@
Kommentar (1 Zeile):
Need to make a quick tweak to this image.
-$ svnadmin rmlocks /var/svn/repos /project/raisin.jpg
-<!--
+$ svnadmin rmlocks /var/svn/repos /project/raisin.jpg <!--
Removed lock on '/project/raisin.jpg'.
-->
Sperre für »/project/raisin.jpg« entfernt.
@@ -6382,25 +6332,21 @@
$ svn status -u
M 23 bar.c
M O 32 raisin.jpg
- * 72 foo.h
-<!--
+ * 72 foo.h <!--
Status against revision: 105
-->
Status bezogen auf Revision: 105
-$ svn unlock raisin.jpg
-<!--
+$ svn unlock raisin.jpg <!--
svn: E195013: 'raisin.jpg' is not locked in this working copy
-->
svn: E195013: '»raisin.jpg« ist in dieser Arbeitskopie nicht gesperrt.
$ svn info raisin.jpg | grep URL
URL: http://svn.example.com/repos/project/raisin.jpg
-$ svn unlock http://svn.example.com/repos/project/raisin.jpg
-<!--
+$ svn unlock http://svn.example.com/repos/project/raisin.jpg <!--
svn: warning: W160039: Unlock failed on 'raisin.jpg' (403 Forbidden)
-->
svn: Warnung: W160039: USperrfreigabe gescheitert: 403 Forbidden
(http://svn.example.com)
-$ svn unlock --force http://svn.example.com/repos/project/raisin.jpg
-<!--
+$ svn unlock --force http://svn.example.com/repos/project/raisin.jpg <!--
'raisin.jpg' unlocked.
-->
»raisin.jpg« freigegeben.
@@ -6461,15 +6407,13 @@
<informalexample>
<screen>
-$ svn lock raisin.jpg
-<!--
+$ svn lock raisin.jpg <!--
svn: warning: W160035: Path '/project/raisin.jpg' is already locked by
user 'h
arry' in filesystem '/var/svn/repos/db'
-->
svn: Warnung: W160035: Pfad »/project/raisin.jpg« ist bereits vom Benutzer
»ha
rry« im Dateisystem »/var/svn/repos/db« gesperrt
-$ svn lock --force raisin.jpg
-<!--
+$ svn lock --force raisin.jpg <!--
'raisin.jpg' locked by user 'sally'.
-->
»raisin.jpg« gesperrt durch »sally«.
@@ -6505,15 +6449,13 @@
$ svn status
K raisin.jpg
$ svn status -u
- B 32 raisin.jpg
-<!--
+ B 32 raisin.jpg <!--
Status against revision: 105
-->
Status bezogen auf Revision: 105
$ svn update
Updating '.':
- B raisin.jpg
-<!--
+ B raisin.jpg <!--
Updated to revision 105.
-->
Aktualisiert zu Revision 105.
@@ -6711,15 +6653,13 @@
gimp: error: file is read-only!
$ ls -l raisin.jpg
-r--r--r-- 1 sally sally 215589 Jun 8 19:23 raisin.jpg
-$ svn lock raisin.jpg
-<!--
+$ svn lock raisin.jpg <!--
svn: warning: W160035: Path '/project/raisin.jpg' is already locked by
user 'h
arry' in filesystem '/var/svn/repos/db'
-->
svn: Warnung: W160035: Pfad »/project/raisin.jpg« ist bereits vom Benutzer
»ha
rry« im Dateisystem »/var/svn/repos/db« gesperrt
-$ svn info http://svn.example.com/repos/project/raisin.jpg | grep Lock
-<!--
+$ svn info http://svn.example.com/repos/project/raisin.jpg | grep Lock <!--
Lock Token: opaquelocktoken:fc2b4dee-98f9-0310-abf3-653ff3226e6b
Lock Owner: harry
Lock Created: 2006-06-08 07:29:18 -0500 (Thu, 08 June 2006)
@@ -6971,12 +6911,10 @@
A calc
A calc/Makefile
A calc/integer.c
-A calc/button.c
-<!--
+A calc/button.c <!--
Checked out revision 148.
-->
Ausgecheckt. Revision 148.
-
<!--
Fetching external item into calc/third-party/sounds
-->
@@ -6986,12 +6924,10 @@
A calc/third-party/sounds/clang.ogg
…
A calc/third-party/sounds/bang.ogg
-A calc/third-party/sounds/twang.ogg
-<!--
+A calc/third-party/sounds/twang.ogg <!--
Checked out revision 14.
-->
Ausgecheckt. Revision 14.
-
<!--
Fetching external item into calc/third-party/skins
-->
@@ -7136,14 +7072,12 @@
A my-project
A my-project/some-dir
A my-project/external-dir
-…
-<!--
+… <!--
Fetching external item into 'my-project/some-dir/subdir'
Checked out external at revision 11.
-->
Hole externen Verweis nach »my-project/some-dir/subdir«
Externer Verweis ausgecheckt, Revision 11.
-
<!--
Checked out revision 11.
-->
@@ -7172,8 +7106,7 @@
<informalexample>
<screen>
$ svn move -q my-project renamed-project
-$ svn commit -m "Rename my-project to renamed-project."
-<!--
+$ svn commit -m "Rename my-project to renamed-project." <!--
Deleting my-project
Adding renamed-project
-->
@@ -7183,7 +7116,6 @@
Committed revision 12.
$ svn update
Updating '.':
-
<!--
svn: warning: W200000: Error handling externals definition
for 'renamed-projec
t/some-dir/subdir':
@@ -7412,17 +7344,14 @@
^/trunk/bikeshed/blue.html at 40 green.html
$ svn update
Updating '.':
-
<!--
Fetching external item into 'www'
-->
Hole externen Verweis nach »www«
-E www/green.html
-<!--
+E www/green.html <!--
Updated external to revision 40.
-->
Externer Verweis aktualisiert zu Revision 40.
-
<!--
Update to revision 103.
-->
@@ -7515,8 +7444,7 @@
<screen>
$ svn status
M X www/green.html
-$ svn commit -m "change the color" www/green.html
-<!--
+$ svn commit -m "change the color" www/green.html <!--
Sending www/green.html
svn: E155011: Commit failed (details follow):
svn: E155011: File '/trunk/bikeshed/blue.html' is out of date
@@ -7937,7 +7865,6 @@
A [math-fixes] integer.c
A [math-fixes] mathops.c
$ svn status
-
<!--
- - - Changelist 'math-fixes':
-->
@@ -7973,7 +7900,6 @@
$ svn changelist math-fixes button.c
A [math-fixes] button.c
$ svn status
-
<!--
- - - Changelist 'math-fixes':
-->
@@ -8023,13 +7949,11 @@
D [math-fixes] button.c
A [ui-fix] button.c
$ svn status
-
<!--
- - - Changelist 'ui-fix':
-->
--- Änderungsliste »ui-fix«:
button.c
-
<!--
- - - Changelist 'math-fixes':
-->
@@ -8072,13 +7996,11 @@
<informalexample>
<screen>
$ svn status
-
<!--
- - Changelist 'ui-fix':
-->
--- Änderungsliste »ui-fix«:
M button.c
-
<!--
- - Changelist 'math-fixes':
-->
@@ -8203,8 +8125,7 @@
<informalexample>
<screen>
$ svn commit -m "Fix a UI bug found while working on math logic." \
- --changelist ui-fix
-<!--
+ --changelist ui-fix <!--
Sending button.c
Transmitting file data .
Committed revision 1158.
@@ -8241,7 +8162,6 @@
<informalexample>
<screen>
$ svn status
-
<!--
- - Changelist 'math-fixes':
-->
=======================================
--- /branches/1.7/de/book/ch04-branching-and-merging.xml Fri May 9
05:44:48 2014 UTC
+++ /branches/1.7/de/book/ch04-branching-and-merging.xml Fri May 9
12:00:28 2014 UTC
@@ -399,12 +399,12 @@
<informalexample>
<screen>
$ svn copy http://svn.example.com/repos/calc/trunk \
- http://svn.example.com/repos/calc/branches/my-calc-branch \
-<!--
+ http://svn.example.com/repos/calc/branches/my-calc-branch \ <!--
-m "Creating a private branch of /calc/trunk."
Committed revision 341.
---> -m "Privaten Zweig von /calc/trunk angelegt."
+-->
+ -m "Privaten Zweig von /calc/trunk angelegt."
Revision 341 übertragen.
$
@@ -564,10 +564,10 @@
$ svn checkout http://svn.example.com/repos/calc/branches/my-calc-branch
A my-calc-branch/Makefile
A my-calc-branch/integer.c
-A my-calc-branch/button.c
-<!--
+A my-calc-branch/button.c <!--
Checked out revision 341.
--->Ausgecheckt, Revision 341.
+-->
+Ausgecheckt, Revision 341.
$
</screen>
</informalexample>
@@ -1230,14 +1230,12 @@
$ pwd
/home/user/my-calc-branch
-$ svn merge ^/calc/trunk
-<!--
+$ svn merge ^/calc/trunk <!--
- - - Merging r345 through r356 into '.':
-->
-- Zusammenführen von r345 bis r356 in ».«:
U button.c
-U integer.c
-<!--
+U integer.c <!--
- - - Recording mergeinfo for merge of r345 through r356 into '.':
-->
-- Aufzeichnung der Informationen für Zusammenführung von r345 in ».«:
@@ -1355,8 +1353,7 @@
<informalexample>
<screen>
$ svn log -v -r 400 ^/branches/foo-feature
-------------------------------------------------------------------------
-<!--
+------------------------------------------------------------------------
<!--
r400 | carol | 2011-11-09 10:51:27 -0500 (Wed, 09 Nov 2011) | 1 line
Changed paths:
A /branch/b2 (from /trunk:399)
@@ -1386,8 +1383,7 @@
<informalexample>
<screen>
-$ svn merge ^/trunk -r399:HEAD
-<!--
+$ svn merge ^/trunk -r399:HEAD <!--
- - - Merging r400 through r556 into '.':
-->
-- Zusammenführen von r400 bis r556 in ».«:
@@ -1689,8 +1685,7 @@
<informalexample>
<screen>
-$ svn merge ^/calc/trunk
-<!--
+$ svn merge ^/calc/trunk <!--
svn: E195020: Cannot merge into mixed-revision working copy [357:378]; try
up\
dating first
-->
@@ -1752,15 +1747,13 @@
Updating '.':
At revision 380.
-$ svn merge ^/calc/trunk
-<!--
+$ svn merge ^/calc/trunk <!--
- - - Merging r357 through r380 into '.':
-->
--- Zusammenführen von r357 bis r380 in ».«:
U integer.c
U Makefile
-A README
-<!--
+A README <!--
- - - Recording mergeinfo for merge of r357 through r380 into '.':
-->
-- Aufzeichnung der Informationen für Zusammenführung von r357 bis r380 in
».«:
@@ -2078,14 +2071,12 @@
<informalexample>
<screen>
-$ svn merge ^/calc/trunk
-<!--
+$ svn merge ^/calc/trunk <!--
- - - Merging r381 through r385 into '.':
-->
--- Zusammenführen von r381 bis r385 in ».«:
U button.c
-U README
-<!--
+U README <!--
- - - Recording mergeinfo for merge of r381 through r385 into '.':
-->
-- Aufzeichnung der Informationen für Zusammenführung von r381 bis r385 in
».«:
@@ -2148,31 +2139,26 @@
/home/user/calc-trunk
$ svn update # (make sure the working copy is up to date)
-Updating '.':
-<!--
+Updating '.': <!--
At revision 390.
-->
Revision 390.
-$ svn merge --reintegrate ^/calc/branches/my-calc-branch
-<!--
+$ svn merge --reintegrate ^/calc/branches/my-calc-branch <!--
- - - Merging differences between repository URLs into '.':
-->
-- Zusammenführen der Unterschiede zwischen Projektarchiv-URLs in ».«:
U button.c
U integer.c
-U Makefile
-<!--
+U Makefile <!--
- - - Recording mergeinfo for merge between repository URLs into '.':
-->
-- Aufzeichnung der Informationen für Zusammenführung zwischen
Projektarchiv-URLs in ».«:
U .
-
<!--
$ # build, test, verify, ...
-->
$ # bauen, testen, überprüfen, ...
-
<!--
$ svn commit -m "Merge my-calc-branch back into trunk!"
Sending .
@@ -2309,8 +2295,7 @@
<informalexample>
<screen>
-$ svn delete ^/calc/branches/my-calc-branch \
-<!--
+$ svn delete ^/calc/branches/my-calc-branch \ <!--
-m "Remove my-calc-branch, reintegrated with trunk in r391."
Committed revision 392.
-->
@@ -2366,8 +2351,7 @@
<informalexample>
<screen>
-$ svn delete http://svn.example.com/repos/calc/branches/my-calc-branch \
-<!--
+$ svn delete http://svn.example.com/repos/calc/branches/my-calc-branch \
<!--
-m "Remove my-calc-branch, reintegrated with trunk in r391."
Committed revision 392.
-->
@@ -2375,8 +2359,7 @@
Revision 392 übertragen.
$ svn copy http://svn.example.com/repos/calc/trunk \
- http://svn.example.com/repos/calc/branches/my-calc-branch
-<!--
+ http://svn.example.com/repos/calc/branches/my-calc-branch <!--
-m "Recreate my-calc-branch from trunk at HEAD."
Committed revision 393.
-->
@@ -2556,7 +2539,6 @@
<informalexample>
<screen>
$ cd my-calc-branch
-
<!--
# Which changes have already been merged from trunk to branch?
-->
@@ -2569,7 +2551,6 @@
r388
r389
r390
-
<!--
# Which changes are still eligible to merge from trunk to branch?
-->
@@ -2639,14 +2620,12 @@
Beispiel:</para>
<informalexample>
- <screen>
-<!--
+ <screen> <!--
# What explicit mergeinfo exists on a branch?
-->
# Welche expliziten Zusammenführungs-Informationen gibt es auf dem Zweig?
$ svn propget svn:mergeinfo ^/branches/proj-X --recursive
/trunk:651-652
-
<!--
# What children does proj-X have?
-->
@@ -2656,7 +2635,6 @@
doc/INSTALL
README
src/main.c
-
<!--
# Ask what revs were merged to a file with no explicit mergeinfo
-->
@@ -2727,14 +2705,12 @@
Zum Beispiel:</para>
<informalexample>
- <screen>
-<!--
+ <screen> <!--
# The '*' decorator indicates non-inheritable mergeinfo
-->
"*" markiert nichterbliche Zusammenführungs-Informationen
$ svn propget svn:mergeinfo ^/branches/proj-X
/trunk:651-652,758*
-
<!--
# Revision 758 is non-inheritable, but still applies to the path it is
# set on. Here the '*' decorator signals that r758 is only partially
@@ -2747,7 +2723,6 @@
651
652
758*
-
<!--
# Revision 758 is not reported as merged because it is non-inheritable
# and applies only to ^/trunk
@@ -2805,16 +2780,14 @@
<informalexample>
<screen>
-$ svn propget svn:mergeinfo --recursive -v
-<!--
+$ svn propget svn:mergeinfo --recursive -v <!--
# Non-inheritable mergeinfo
Properties on '.':
-->
# Nichterbliche Zusammenführungs-Informationen
Eigenschaften zu ».«
svn:mergeinfo
- /trunk:651-652,758*
-<!--
+ /trunk:651-652,758* <!--
# Subtree mergeinfo
Properties on 'doc/INSTALL':
-->
@@ -2900,15 +2873,13 @@
<informalexample>
<screen>
-$ svn merge ^/calc/trunk --dry-run
-<!--
+$ svn merge ^/calc/trunk --dry-run <!--
- - Merging r391 through r395 into 'branch':
-->
-- Zusammenführen von r391 bis r395ld in »branch«:
U integer.c
-$ svn status
-<!--
+$ svn status <!--
# nothing printed, working copy is still unchanged.
-->
# es wird nichts ausgegeben, die Arbeitskopie ist unverändert
@@ -3029,13 +3000,11 @@
<informalexample>
<screen>
-$ svn merge -c -303 ^/calc/trunk
-<!--
+$ svn merge -c -303 ^/calc/trunk <!--
- - - Reverse-merging r303 into 'integer.c':
-->
-- Rückwärtiges Zusammenführen von r303 in »integer.c«:
-U integer.c
-<!--
+U integer.c <!--
- - - Recording mergeinfo for reverse merge of r303 into 'integer.c':
-->
-- Aufzeichnung der Informationen für rückwärtiges Zusammenführen von r303
in »integer.c«:
@@ -3046,13 +3015,11 @@
M integer.c
$ svn diff
-…
-<!--
+… <!--
# verify that the change is removed
-->
# überprüfen, ob die Änderung entfernt wurde
…
-
<!--
$ svn commit -m "Undoing change committed in r303."
Sending integer.c
@@ -3249,8 +3216,7 @@
$ cd parent-dir
$ svn log -v
…
-------------------------------------------------------------------------
-<!--
+------------------------------------------------------------------------
<!--
r808 | joe | 2003-12-26 14:29:40 -0600 (Fri, 26 Dec 2003) | 3 lines
Changed paths:
-->
@@ -3258,7 +3224,6 @@
Geänderte Pfade:
D /calc/trunk/real.c
M /calc/trunk/integer.c
-
<!--
Added fast fourier transform functions to integer.c.
Removed real.c because code now in double.c.
@@ -3364,7 +3329,6 @@
$ svn status
A + real.c
-
<!--
$ svn commit -m "Resurrected real.c from revision 807, /calc/trunk/real.c."
Adding real.c
@@ -3414,7 +3378,6 @@
$ svn add real.c
A real.c
-
<!--
$ svn commit -m "Re-created real.c from revision 807."
Adding real.c
@@ -3445,8 +3408,7 @@
<informalexample>
<screen>
-$ svn copy ^/calc/trunk/real.c at 807 ^/calc/trunk/ \
-<!--
+$ svn copy ^/calc/trunk/real.c at 807 ^/calc/trunk/ \ <!--
-m "Resurrect real.c from revision 807."
Committed revision 1390.
-->
@@ -3455,8 +3417,7 @@
$ svn update
Updating '.':
-A real.c
-<!--
+A real.c <!--
Updated to revision 1390.
-->
Aktualisiert zu Revision 1390.
@@ -3591,13 +3552,11 @@
<informalexample>
<screen>
-$ svn merge -c 355 ^/calc/trunk
-<!--
+$ svn merge -c 355 ^/calc/trunk <!--
- - - Merging r355 into '.':
-->
--- Zusammenführen von r355 in ».«:
-U integer.c
-<!--
+U integer.c <!--
- - - Recording mergeinfo for merge of r355 into '.':
-->
-- Aufzeichnung der Informationen für Zusammenführung von r355 in ».«:
@@ -3632,7 +3591,6 @@
$ svn propget svn:mergeinfo .
/trunk:341-349,355
-
<!--
# Notice that r355 isn't listed as "eligible" to merge, because
# it's already been merged.
@@ -3651,15 +3609,13 @@
r359
r360
-$ svn merge ^/calc/trunk
-<!--
+$ svn merge ^/calc/trunk <!--
- - - Merging r350 through r354 into '.':
-->
--- Zusammenführen von r350 bis r354 in ».«:
U .
U integer.c
-U Makefile
-<!--
+U Makefile <!--
- - - Merging r356 through r360 into '.':
-->
--- Zusammenführen von r356 bis r360 in ».«:
@@ -4356,20 +4312,17 @@
<informalexample>
<screen>
-$ svn merge -r 1288:1351 http://svn.example.com/myrepos/branch
-<!--
+$ svn merge -r 1288:1351 http://svn.example.com/myrepos/branch <!--
- - - Merging r1289 through r1351 into '.':
-->
-- Zusammenführen von r1289 bis r1361 in ».«:
C bar.c
C foo.c
- C docs
-<!--
+ C docs <!--
- - - Recording mergeinfo for merge of r1289 through r1351 into '.':
-->
-- Aufzeichnung der Informationen für Zusammenführung von r1289 bis r1351
in ».«:
- U .
-<!--
+ U . <!--
Summary of conflicts:
Tree conflicts: 3
-->
@@ -4377,18 +4330,15 @@
Baumkonflikte: 3
$ svn st
-! C bar.c
-<!--
+! C bar.c <!--
> local missing, incoming edit upon merge
-->
> lokal fehlend, eingehend editiert bei Zusammenführung
-! C foo.c
-<!--
+! C foo.c <!--
> local missing, incoming edit upon merge
-->
> lokal fehlend, eingehend editiert bei Zusammenführung
-! C docs
-<!--
+! C docs <!--
> local delete, incoming edit upon merge
-->
> lokal fehlend, eingehend editiert bei Zusammenführung
@@ -4439,19 +4389,16 @@
<informalexample>
<screen>
-$ svn merge -c 1701 http://svn.example.com/myrepos/branchX --accept
postpone
-<!--
+$ svn merge -c 1701 http://svn.example.com/myrepos/branchX --accept
postpone <!--
- - - Merging r1701 into '.':
-->
-- Zusammenführen von r1701 in ».«:
C glub.c
-C sputter.c
-<!--
+C sputter.c <!--
- - - Recording mergeinfo for merge of r1701 into '.':
-->
-- Aufzeichnung der Informationen für Zusammenführung von r1701 in ».«:
- U .
-<!--
+ U . <!--
Summary of conflicts:
Text conflicts: 2
-->
@@ -4467,8 +4414,7 @@
? sputter.c.merge-left.r1700
? sputter.c.merge-right.r1701
C sputter.c
-? sputter.c.working
-<!--
+? sputter.c.working <!--
Summary of conflicts:
Text conflicts: 2
-->
@@ -4598,13 +4544,11 @@
$ svn propget svn:mergeinfo .
/trunk:1680-3305
-
<!--
# Let's make the metadata list r3328 as already merged.
-->
# In den Metadaten r3328 als bereits zusammengeführt vermerken.
-$ svn merge -c 3328 --record-only ^/calc/trunk
-<!--
+$ svn merge -c 3328 --record-only ^/calc/trunk <!--
- - - Recording mergeinfo for merge of r3328 into '.':
-->
- Aufzeichnung der Informationen für Zusammenführung von r3328 in ».«:
@@ -4615,7 +4559,6 @@
$ svn propget svn:mergeinfo .
/trunk:1680-3305,3328
-
<!--
$ svn commit -m "Block r3328 from being merged to the branch."
-->
@@ -4654,8 +4597,7 @@
<informalexample>
<screen>
$ svn log -v ^/trunk -r 1055
-------------------------------------------------------------------------
-<!--
+------------------------------------------------------------------------
<!--
r1055 | francesca | 2011-09-22 07:40:06 -0400 (Thu, 22 Sep 2011) | 3 lines
Changed paths:
-->
@@ -4663,7 +4605,6 @@
Geänderte Pfade:
M /trunk
M /trunk/src/frazzle.c
-
<!--
Reintegrate the frazzle-feature-branch to trunk.
-->
@@ -4686,13 +4627,11 @@
===================================================================
--- . (revision 1054)
+++ . (revision 1055)
-
<!--
Property changes on: .
-->
Eigenschaftsänderungen: .
-___________________________________________________________________
-<!--
+___________________________________________________________________ <!--
Modified: svn:mergeinfo
Merged /branches/frazzle-feature-branch:r997-1003
-->
@@ -4733,13 +4672,11 @@
<screen>
$ cd branches/proj-X
-$ svn merge ^/trunk . -c 1055 --record-only
-<!--
+$ svn merge ^/trunk . -c 1055 --record-only <!--
- - - Merging r1055 into '.':
-->
-- Zusammenführen von r1055 in ».«:
- G .
-<!--
+ G . <!--
- - - Recording mergeinfo for merge of r1055 into '.':
-->
-- Aufzeichnung der Informationen für Zusammenführung von r1055 in ».«:
@@ -4747,8 +4684,7 @@
$ svn diff --depth empty .
Index: .
-===================================================================
-<!--
+=================================================================== <!--
- - - . (revision 1070)
+++ . (working copy)
@@ -5101,8 +5037,7 @@
<informalexample>
<screen>
$ svn log -v -r 390
-------------------------------------------------------------------------
-<!--
+------------------------------------------------------------------------
<!--
r390 | user | 2002-11-22 11:01:57 -0600 (Fri, 22 Nov 2002) | 1 line
Changed paths:
M /branches/my-calc-branch/button.c
@@ -5138,8 +5073,7 @@
<informalexample>
<screen>
$ svn log -v -r 390 -g
-------------------------------------------------------------------------
-<!--
+------------------------------------------------------------------------
<!--
r390 | user | 2002-11-22 11:01:57 -0600 (Fri, 22 Nov 2002) | 1 line
Changed paths:
M /branches/my-calc-branch/button.c
@@ -5153,8 +5087,7 @@
M /branches/my-calc-branch/README
Letzte Zusammenführung der Änderungen von trunk changes in my-calc-branch.
-------------------------------------------------------------------------
-<!--
+------------------------------------------------------------------------
<!--
r383 | sally | 2002-11-21 03:19:00 -0600 (Thu, 21 Nov 2002) | 2 lines
Changed paths:
M /branches/my-calc-branch/button.c
@@ -5168,8 +5101,7 @@
Zusammengeführt mittels: r390
Inverse Grafik auf Knopf behoben.
-------------------------------------------------------------------------
-<!--
+------------------------------------------------------------------------
<!--
r382 | sally | 2002-11-20 16:57:06 -0600 (Wed, 20 Nov 2002) | 2 lines
Changed paths:
M /branches/my-calc-branch/README
@@ -5510,15 +5442,13 @@
<screen>
$ cd calc/trunk
-$ svn merge --reintegrate ^/calc/branches/my-calc-branch
-<!--
+$ svn merge --reintegrate ^/calc/branches/my-calc-branch <!--
- - - Merging differences between repository URLs into '.':
-->
-- Zusammenführen der Unterschiede zwischen Projektarchiv-URLs in ».«:
D integer.c
A whole.c
-U .
-<!--
+U . <!--
- - - Recording mergeinfo for merge between repository URLs into '.':
-->
-- Aufzeichnung der Informationen für Zusammenführung zwischen
Projektarchiv-URLs in ».«:
@@ -5939,8 +5869,7 @@
$ svn switch ^/calc/branches/my-calc-branch
U integer.c
U button.c
-U Makefile
-<!--
+U Makefile <!--
Updated to revision 341.
-->
Aktualisiert zu Revision 341.
@@ -6231,15 +6160,13 @@
<informalexample>
<screen>
$ svn copy http://svn.example.com/repos/calc/trunk \
- http://svn.example.com/repos/calc/branches/newbranch \
-<!--
+ http://svn.example.com/repos/calc/branches/newbranch \ <!--
-m "Create branch 'newbranch'."
Committed revision 353.
-->
-m "Zweig 'newbranch' angelegt."
Revision 353 übertragen.
-$ svn switch ^/calc/branches/newbranch
-<!--
+$ svn switch ^/calc/branches/newbranch <!--
At revision 353.
-->
Revision 353.
@@ -6331,8 +6258,7 @@
<informalexample>
<screen>
$ svn copy http://svn.example.com/repos/calc/trunk \
- http://svn.example.com/repos/calc/tags/release-1.0 \
-<!--
+ http://svn.example.com/repos/calc/tags/release-1.0 \ <!--
-m "Tagging the 1.0 release of the 'calc' project."
Committed revision 902.
@@ -6512,8 +6438,7 @@
my-working-copy/
$ svn copy my-working-copy \
- http://svn.example.com/repos/calc/tags/mytag \
-<!--
+ http://svn.example.com/repos/calc/tags/mytag \ <!--
-m "Tag my existing working copy state."
Committed revision 940.
@@ -6755,8 +6680,7 @@
<informalexample>
<screen>
-$ svn delete http://svn.example.com/repos/calc/branches/my-calc-branch \
-<!--
+$ svn delete http://svn.example.com/repos/calc/branches/my-calc-branch \
<!--
-m "Removing obsolete branch of calc project."
Committed revision 375.
@@ -6803,8 +6727,7 @@
<informalexample>
<screen>
$ svn copy http://svn.example.com/repos/calc/branches/my-calc-branch@374 \
- http://svn.example.com/repos/calc/branches/my-calc-branch \
-<!--
+ http://svn.example.com/repos/calc/branches/my-calc-branch \ <!--
-m "Restore my-calc-branch."
Committed revision 376.
@@ -6850,8 +6773,7 @@
<informalexample>
<screen>
$ svn copy http://svn.example.com/repos/calc/trunk \
- http://svn.example.com/repos/calc/branches/stable-1.0 \
-<!--
+ http://svn.example.com/repos/calc/branches/stable-1.0 \ <!--
-m "Creating stable branch of calc project."
Committed revision 377.
@@ -7240,14 +7162,12 @@
$ cd trunk-working-copy
$ svn update
-Updating '.':
-<!--
+Updating '.': <!--
At revision 1910.
-->
Revision 1910.
-$ svn merge --reintegrate ^/calc/branches/mybranch
-<!--
+$ svn merge --reintegrate ^/calc/branches/mybranch <!--
- - - Merging differences between repository URLs into '.':
-->
-- Zusammenführen der Unterschiede zwischen Projektarchiv-URLs in ».«:
@@ -7519,8 +7439,7 @@
<informalexample>
<screen>
$ svn import /path/to/libcomplex-1.0 \
- http://svn.example.com/repos/vendor/libcomplex/current \
-<!--
+ http://svn.example.com/repos/vendor/libcomplex/current \ <!--
-m "importing initial 1.0 vendor drop"
-->
-m "Importing der ersten 1.0 Zulieferung"
@@ -7552,15 +7471,13 @@
<informalexample>
<screen>
$ svn copy http://svn.example.com/repos/vendor/libcomplex/current \
- http://svn.example.com/repos/vendor/libcomplex/1.0 \
-<!--
+ http://svn.example.com/repos/vendor/libcomplex/1.0 \ <!--
-m "tagging libcomplex-1.0"
-->
-m "Tag libcomplex-1.0"
…
$ svn copy http://svn.example.com/repos/vendor/libcomplex/1.0 \
- http://svn.example.com/repos/calc/libcomplex \
-<!--
+ http://svn.example.com/repos/calc/libcomplex \ <!--
-m "bringing libcomplex-1.0 into the main branch"
-->
-m "libcomplex-1.0 in den Huptzweig bringen"
@@ -7693,8 +7610,7 @@
$ cd working-copies/calc
$ svn merge ^/vendor/libcomplex/1.0 \
^/vendor/libcomplex/current \
- libcomplex
-<!--
+ libcomplex <!--
… # resolve all the conflicts between their changes and our changes
$ svn commit -m "merging libcomplex-1.1 into the main branch"
-->
More information about the svnbook-dev
mailing list