hgbook
annotate it/examples/branch-repo.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 | 713f0f69029a 5bbebcdfb533 |
children |
rev | line source |
---|---|
Giulio@792 | 1 <!-- BEGIN branch-repo.merge --> |
Giulio@792 | 2 <screen><prompt>$</prompt> <userinput>hg merge</userinput> |
Giulio@792 | 3 1 file aggiornati, 0 file uniti, 0 file rimossi, 0 file irrisolti |
Giulio@792 | 4 (unione tra rami, ricordatevi di eseguire il commit) |
gpiancastelli@850 | 5 <prompt>$</prompt> <userinput>hg commit -m "Incorpora la correzione dal ramo 1.0.1."</userinput> |
Giulio@792 | 6 <prompt>$</prompt> <userinput>hg push</userinput> |
Giulio@805 | 7 trasmetto a /tmp/mioprogetto |
Giulio@792 | 8 cerco i cambiamenti |
Giulio@792 | 9 aggiungo i changeset |
Giulio@792 | 10 aggiungo i manifest |
Giulio@792 | 11 aggiungo i cambiamenti ai file |
Giulio@792 | 12 aggiunti 2 changeset con 1 cambiamenti a 1 file |
Giulio@792 | 13 </screen> |
Giulio@792 | 14 <!-- END branch-repo.merge --> |