hgbook

annotate it/examples/branch-named.merge.it @ 825:739b5231c13b

find changesets by author, revision, files, or words in the commit message
More minor changes to Ch.1.
author Giulio@puck
date Sat Aug 15 22:40:31 2009 +0200 (2009-08-15)
parents
children 7252e7b7f07d
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)
Giulio@792 7 <prompt>$</prompt> <userinput>hg commit -m 'Unione.'</userinput>
Giulio@792 8 <prompt>$</prompt> <userinput>hg tip</userinput>
Giulio@792 9 changeset: 4:f50f493d0dc0
Giulio@792 10 branch: bar
Giulio@792 11 tag: tip
Giulio@792 12 parent: 2:4dce38140953
Giulio@792 13 parent: 3:859c842ea668
Giulio@792 14 user: Bryan O'Sullivan &lt;bos@serpentine.com&gt;
Giulio@792 15 date: Fri Jun 05 15:49:06 2009 +0000
Giulio@792 16 summary: Unione.
Giulio@792 17
Giulio@792 18 </screen>
Giulio@792 19 <!-- END branch-named.merge -->