hgbook
annotate it/examples/daily.copy.merge.it @ 1114:527b86d55d4a
inotify: update installation information
inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Sun Dec 13 16:35:56 2009 +0900 (2009-12-13) |
parents | |
children |
rev | line source |
---|---|
Giulio@790 | 1 <!-- BEGIN daily.copy.merge --> |
Giulio@790 | 2 <screen><prompt>$</prompt> <userinput>hg pull ../mia-copia</userinput> |
Giulio@790 | 3 estraggo da ../mia-copia |
Giulio@790 | 4 cerco i cambiamenti |
Giulio@790 | 5 aggiungo i changeset |
Giulio@790 | 6 aggiungo i manifest |
Giulio@790 | 7 aggiungo i cambiamenti ai file |
Giulio@790 | 8 aggiunti 1 changeset con 1 cambiamenti a 1 file (+1 teste) |
Giulio@790 | 9 (eseguite 'hg heads' per vedere le teste, 'hg merge' per unire) |
Giulio@790 | 10 <prompt>$</prompt> <userinput>hg merge</userinput> |
Giulio@790 | 11 unisco file e nuovo-file in nuovo-file |
Giulio@790 | 12 0 file aggiornati, 1 file uniti, 0 file rimossi, 0 file irrisolti |
Giulio@790 | 13 (unione tra rami, ricordatevi di eseguire il commit) |
Giulio@790 | 14 <prompt>$</prompt> <userinput>cat nuovo-file</userinput> |
Giulio@790 | 15 riga |
Giulio@790 | 16 nuovi contenuti |
Giulio@790 | 17 </screen> |
Giulio@790 | 18 <!-- END daily.copy.merge --> |