hgbook

diff it/examples/branch-repo.merge.it @ 793:d4de8d288ba6

find changesets by author, revision, files, or words in the commit message
Minor changes and translation of code snippets for Ch.9.
author Giulio@puck
date Wed Aug 12 23:47:08 2009 +0200 (2009-08-12)
parents
children c35067358254
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/it/examples/branch-repo.merge.it	Wed Aug 12 23:47:08 2009 +0200
     1.3 @@ -0,0 +1,14 @@
     1.4 +<!-- BEGIN branch-repo.merge -->
     1.5 +<screen><prompt>$</prompt> <userinput>hg merge</userinput>
     1.6 +1 file aggiornati, 0 file uniti, 0 file rimossi, 0 file irrisolti
     1.7 +(unione tra rami, ricordatevi di eseguire il commit)
     1.8 +<prompt>$</prompt> <userinput>hg commit -m 'Incorpora la correzione dal ramo 1.0.1.'</userinput>
     1.9 +<prompt>$</prompt> <userinput>hg push</userinput>
    1.10 +trasmetto a /temp/mioprogetto
    1.11 +cerco i cambiamenti
    1.12 +aggiungo i changeset
    1.13 +aggiungo i manifest
    1.14 +aggiungo i cambiamenti ai file
    1.15 +aggiunti 2 changeset con 1 cambiamenti a 1 file
    1.16 +</screen>
    1.17 +<!-- END branch-repo.merge -->