[svnbook] r4554 committed - Translation: General Vendor Branch Management Procedure
svnbook at googlecode.com
svnbook at googlecode.com
Sat Nov 2 08:28:23 CDT 2013
Revision: 4554
Author: jmfelderhoff at gmx.eu
Date: Sat Nov 2 13:28:13 2013 UTC
Log: Translation: General Vendor Branch Management Procedure
http://code.google.com/p/svnbook/source/detail?r=4554
Modified:
/branches/1.6/de/book/ch04-branching-and-merging.xml
=======================================
--- /branches/1.6/de/book/ch04-branching-and-merging.xml Sat Nov 2
13:12:49 2013 UTC
+++ /branches/1.6/de/book/ch04-branching-and-merging.xml Sat Nov 2
13:28:13 2013 UTC
@@ -6507,19 +6507,23 @@
Schritte mit einem einzigen Befehl bewerkstelligen:</para>
<!--
- <screen>
+ <informalexample>
+ <screen>
$ svn import /path/to/libcomplex-1.0 \
http://svn.example.com/repos/vendor/libcomplex/current \
- -m 'importing initial 1.0 vendor drop'
+ -m "importing initial 1.0 vendor drop"
…
</screen>
+ </informalexample>
-->
- <screen>
+ <informalexample>
+ <screen>
$ svn import /path/to/libcomplex-1.0 \
http://svn.example.com/repos/vendor/libcomplex/current \
- -m 'Importing der ersten 1.0 Zulieferung'
+ -m "Importing der ersten 1.0 Zulieferung"
…
</screen>
+ </informalexample>
<!--
<para>We now have the current version of the libcomplex source
@@ -6543,49 +6547,47 @@
Anpassungen vornehmen:</para>
<!--
- <screen>
+ <informalexample>
+ <screen>
$ svn copy http://svn.example.com/repos/vendor/libcomplex/current \
http://svn.example.com/repos/vendor/libcomplex/1.0 \
- -m 'tagging libcomplex-1.0'
+ -m "tagging libcomplex-1.0"
…
$ svn copy http://svn.example.com/repos/vendor/libcomplex/1.0 \
http://svn.example.com/repos/calc/libcomplex \
- -m 'bringing libcomplex-1.0 into the main branch'
+ -m "bringing libcomplex-1.0 into the main branch"
…
</screen>
+ </informalexample>
-->
- <screen>
+ <informalexample>
+ <screen>
$ svn copy http://svn.example.com/repos/vendor/libcomplex/current \
http://svn.example.com/repos/vendor/libcomplex/1.0 \
- -m 'Tag 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 \
- -m 'libcomplex-1.0 in den Huptzweig bringen'
+ -m "libcomplex-1.0 in den Huptzweig bringen"
…
</screen>
+ </informalexample>
<!--
<para>We check out our project's main branch—which now
includes a copy of the first vendor drop—and we get to
work customizing the libcomplex code. Before we know it, our
modified version of libcomplex is now completely integrated
- into our calculator program.
- <footnote>
- <para>And is entirely bug-free, of course!</para>
- </footnote>
- </para>
+ into our calculator program.<footnote><para>And is entirely
+ bug-free, of course!</para></footnote></para>
-->
<para>Wir checken nun den Hauptzweig unseres Projektes aus
– der nun eine Kopie der ersten Zulieferung enthält
– und fangen damit an, den Quelltext von libcomplex
anzupassen. Ehe wir uns versehen, ist unsere angepasste
Version von libcomplex vollständig in unser
- Taschenrechner-Programm integriert.
- <footnote>
- <para>Und er ist natürlich völlig frei von Fehlern!</para>
- </footnote>
- </para>
+ Taschenrechner-Programm integriert.<footnote><para>Und er ist
+ natürlich völlig frei von Fehlern!</para></footnote></para>
<!--
<para>A few weeks later, the developers of libcomplex release a
@@ -6692,25 +6694,29 @@
Hauptentwicklungszweig ein:</para>
<!--
- <screen>
+ <informalexample>
+ <screen>
$ cd working-copies/calc
-$ svn merge http://svn.example.com/repos/vendor/libcomplex/1.0 \
- http://svn.example.com/repos/vendor/libcomplex/current \
+$ svn merge ^/vendor/libcomplex/1.0 \
+ ^/vendor/libcomplex/current \
libcomplex
… # resolve all the conflicts between their changes and our changes
-$ svn commit -m 'merging libcomplex-1.1 into the main branch'
+$ svn commit -m "merging libcomplex-1.1 into the main branch"
…
</screen>
+ </informalexample>
-->
- <screen>
+ <informalexample>
+ <screen>
$ cd working-copies/calc
-$ svn merge http://svn.example.com/repos/vendor/libcomplex/1.0 \
- http://svn.example.com/repos/vendor/libcomplex/current \
+$ svn merge ^/vendor/libcomplex/1.0 \
+ ^/vendor/libcomplex/current \
libcomplex
… # alle Konflikte zwischen ihren und unseren Änderungen auflösen
-$ svn commit -m 'merging libcomplex-1.1 into the main branch'
+$ svn commit -m "merging libcomplex-1.1 into the main branch"
…
</screen>
+ </informalexample>
<!--
<para>In the trivial use case, the new version of our
@@ -6767,7 +6773,9 @@
<!-- TODO: Try to clarify some of the steps for svn_load_dirs.pl
(Garrett sez they've been "glossed over". Also, consider
another section on bypassing svn_load_dirs.pl altogether and
- running with just svn merge, now that it ignores ancestry. -->
+ running with just svn merge, now that it ignores ancestry.
+ Another idea would be presenting this using foreign repos
+ merges. -->
<!-- ===============================================================
-->
<sect2 id="svn.advanced.vendorbr.svn_load_dirs">
More information about the svnbook-dev
mailing list