Unterschiede

Hier werden die Unterschiede zwischen zwei Versionen angezeigt.

--- becki:linux:diffupgrade [2010-02-15 09:48]
becki
+++ becki:linux:diffupgrade [2011-06-08 16:26] (aktuell)
becki
@@ Zeile 20: / Zeile 20: @@
   mv conf.new conf.org
-An alternative to the ''merge'' command is ''diff3'', it should produce the same result:
+<note tip>All ''*.org'' files can serve as a reminder for you to trace back all the modifications you did to the system. But sometimes you have to create a config file which did not exist before (e.g. ''myConfigFile''). In order not to forget such files during update, it is advisable to create an //empty// counterpart file ''myConfFile.org''.</note>
-  diff3 -m conf conf.org conf.new > conf.out
-  mv conf.out conf
-A 2nd alternative to merge are the diff/patch tools. See [[diff patch tips]]
-Another tip: All ''*.org'' files can serve as a reminder for you to trace back all the modifications you did to the system. But sometimes you have to create a config file which did not exist before (e.g. ''myConfigFile''). In order not to forget such files during update, it is advisable to create an //empty// counterpart file ''myConfFile.org''.
 ===== Example where the tools fail ==
@@ Zeile 51: / Zeile 44: @@
                            Helga=9       Helga=9     Helga=9
 </code>
+===== Alternatives ==
+  * An alternative to the ''merge'' command is ''diff3'', it should produce the same result:<code bash>
+diff3 -m conf conf.org conf.new > conf.out
+mv conf.out conf
+</code>
+  * A 2nd alternative to merge are the diff/patch tools. See [[diff patch tips]]

In Becki sei Wiki

Benutzer-Werkzeuge

Webseiten-Werkzeuge

Unterschiede

Seiten-Werkzeuge