hgbook

diff it/examples/issue29.go.it @ 790:3d5e63d5d180

find changesets by author, revision, files, or words in the commit message
Minor changes and translation of code snippets for Ch.5.
author Giulio@puck
date Tue Aug 11 21:53:03 2009 +0200 (2009-08-11)
parents
children 0a49072e8c7f
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/it/examples/issue29.go.it	Tue Aug 11 21:53:03 2009 +0200
     1.3 @@ -0,0 +1,20 @@
     1.4 +<!-- BEGIN issue29.go -->
     1.5 +<screen><prompt>$</prompt> <userinput>hg init problema29</userinput>
     1.6 +<prompt>$</prompt> <userinput>cd problema29</userinput>
     1.7 +<prompt>$</prompt> <userinput>echo a &gt; a</userinput>
     1.8 +<prompt>$</prompt> <userinput>hg ci -Ama</userinput>
     1.9 +aggiungo a
    1.10 +<prompt>$</prompt> <userinput>echo b &gt; b</userinput>
    1.11 +<prompt>$</prompt> <userinput>hg ci -Amb</userinput>
    1.12 +aggiungo b
    1.13 +<prompt>$</prompt> <userinput>hg up 0</userinput>
    1.14 +0 file aggiornati, 0 file uniti, 1 file rimossi, 0 file irrisolti
    1.15 +<prompt>$</prompt> <userinput>mkdir b</userinput>
    1.16 +<prompt>$</prompt> <userinput>echo b &gt; b/b</userinput>
    1.17 +<prompt>$</prompt> <userinput>hg ci -Amc</userinput>
    1.18 +aggiungo b/b
    1.19 +creata una nuova testa
    1.20 +<prompt>$</prompt> <userinput>hg merge</userinput>
    1.21 +fallimento: รจ una directory: /tmp/problema29jbjGH5/problema29/b
    1.22 +</screen>
    1.23 +<!-- END issue29.go -->