hgbook

view it/examples/branch-repo.merge.it @ 999:a6b81cd31cfd

find changesets by author, revision, files, or words in the commit message
adding complete.xml - which generated but Bryan did add it also - as I have absolutly no personnality I do as he does
author Romain PELISSE <belaran@gmail.com>
date Sat Sep 12 20:53:36 2009 +0200 (2009-09-12)
parents 713f0f69029a 5bbebcdfb533
children
line source
1 <!-- BEGIN branch-repo.merge -->
2 <screen><prompt>$</prompt> <userinput>hg merge</userinput>
3 1 file aggiornati, 0 file uniti, 0 file rimossi, 0 file irrisolti
4 (unione tra rami, ricordatevi di eseguire il commit)
5 <prompt>$</prompt> <userinput>hg commit -m "Incorpora la correzione dal ramo 1.0.1."</userinput>
6 <prompt>$</prompt> <userinput>hg push</userinput>
7 trasmetto a /tmp/mioprogetto
8 cerco i cambiamenti
9 aggiungo i changeset
10 aggiungo i manifest
11 aggiungo i cambiamenti ai file
12 aggiunti 2 changeset con 1 cambiamenti a 1 file
13 </screen>
14 <!-- END branch-repo.merge -->