hgbook
annotate it/examples/branch-repo.merge.it @ 976:713f0f69029a
merge with Italian, and very (few) work on ch03
| author | Romain PELISSE <belaran@gmail.com> |
|---|---|
| date | Fri Sep 04 16:33:35 2009 +0200 (2009-09-04) |
| parents | |
| children | 719b03ea27c8 |
| rev | line source |
|---|---|
| belaran@976 | 1 <!-- BEGIN branch-repo.merge --> |
| belaran@976 | 2 <screen><prompt>$</prompt> <userinput>hg merge</userinput> |
| belaran@976 | 3 1 file aggiornati, 0 file uniti, 0 file rimossi, 0 file irrisolti |
| belaran@976 | 4 (unione tra rami, ricordatevi di eseguire il commit) |
| belaran@976 | 5 <prompt>$</prompt> <userinput>hg commit -m "Incorpora la correzione dal ramo 1.0.1."</userinput> |
| belaran@976 | 6 <prompt>$</prompt> <userinput>hg push</userinput> |
| belaran@976 | 7 trasmetto a /tmp/mioprogetto |
| belaran@976 | 8 cerco i cambiamenti |
| belaran@976 | 9 aggiungo i changeset |
| belaran@976 | 10 aggiungo i manifest |
| belaran@976 | 11 aggiungo i cambiamenti ai file |
| belaran@976 | 12 aggiunti 2 changeset con 1 cambiamenti a 1 file |
| belaran@976 | 13 </screen> |
| belaran@976 | 14 <!-- END branch-repo.merge --> |