hgbook
annotate it/examples/branch-named.merge.it @ 1032:a55f319bcc67
Merge with Romain Pelisse
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Sat Jul 10 06:24:49 2010 +0100 (2010-07-10) |
| parents | 713f0f69029a 5bbebcdfb533 |
| children |
| rev | line source |
|---|---|
| Giulio@792 | 1 <!-- BEGIN branch-named.merge --> |
| Giulio@792 | 2 <screen><prompt>$</prompt> <userinput>hg branch</userinput> |
| Giulio@792 | 3 bar |
| Giulio@792 | 4 <prompt>$</prompt> <userinput>hg merge foo</userinput> |
| Giulio@792 | 5 1 file aggiornati, 0 file uniti, 0 file rimossi, 0 file irrisolti |
| Giulio@792 | 6 (unione tra rami, ricordatevi di effettuare il commit) |
| gpiancastelli@850 | 7 <prompt>$</prompt> <userinput>hg commit -m "Unione."</userinput> |
| Giulio@792 | 8 <prompt>$</prompt> <userinput>hg tip</userinput> |
| Giulio@792 | 9 changeset: 4:f50f493d0dc0 |
| gpiancastelli@840 | 10 ramo: bar |
| gpiancastelli@840 | 11 etichetta: tip |
| gpiancastelli@840 | 12 genitore: 2:4dce38140953 |
| gpiancastelli@840 | 13 genitore: 3:859c842ea668 |
| gpiancastelli@840 | 14 utente: Bryan O'Sullivan <bos@serpentine.com> |
| gpiancastelli@840 | 15 data: Fri Jun 05 15:49:06 2009 +0000 |
| gpiancastelli@840 | 16 sommario: Unione. |
| Giulio@792 | 17 |
| Giulio@792 | 18 </screen> |
| Giulio@792 | 19 <!-- END branch-named.merge --> |