hgbook

annotate it/examples/issue29.go.it @ 882:50d09b8f3c4f

find changesets by author, revision, files, or words in the commit message
Remove /tmp/REV*-hello when clean
author Dongsheng Song <dongsheng.song@gmail.com>
date Wed Oct 21 16:33:28 2009 +0800 (2009-10-21)
parents 3d5e63d5d180
children 719b03ea27c8
rev   line source
Giulio@790 1 <!-- BEGIN issue29.go -->
Giulio@790 2 <screen><prompt>$</prompt> <userinput>hg init problema29</userinput>
Giulio@790 3 <prompt>$</prompt> <userinput>cd problema29</userinput>
Giulio@790 4 <prompt>$</prompt> <userinput>echo a &gt; a</userinput>
Giulio@790 5 <prompt>$</prompt> <userinput>hg ci -Ama</userinput>
Giulio@790 6 aggiungo a
Giulio@790 7 <prompt>$</prompt> <userinput>echo b &gt; b</userinput>
Giulio@790 8 <prompt>$</prompt> <userinput>hg ci -Amb</userinput>
Giulio@790 9 aggiungo b
Giulio@790 10 <prompt>$</prompt> <userinput>hg up 0</userinput>
Giulio@790 11 0 file aggiornati, 0 file uniti, 1 file rimossi, 0 file irrisolti
Giulio@790 12 <prompt>$</prompt> <userinput>mkdir b</userinput>
Giulio@790 13 <prompt>$</prompt> <userinput>echo b &gt; b/b</userinput>
Giulio@790 14 <prompt>$</prompt> <userinput>hg ci -Amc</userinput>
Giulio@790 15 aggiungo b/b
Giulio@790 16 creata una nuova testa
Giulio@790 17 <prompt>$</prompt> <userinput>hg merge</userinput>
gpiancastelli@839 18 fallimento: รจ una directory: /tmp/problema29/b
Giulio@790 19 </screen>
Giulio@790 20 <!-- END issue29.go -->