hgbook
diff en/examples/tour @ 100:272146fab009
Add yet another illustration of the merge process.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed Oct 18 12:06:56 2006 -0700 (2006-10-18) |
parents | 97638d862ef3 |
children | ff9dc8bc2a8b |
line diff
1.1 --- a/en/examples/tour Thu Oct 12 16:27:00 2006 -0700 1.2 +++ b/en/examples/tour Wed Oct 18 12:06:56 2006 -0700 1.3 @@ -105,6 +105,7 @@ 1.4 1.5 hg update 2 1.6 hg parents 1.7 +hg update 1.8 1.9 #$ name: clone-push 1.10 1.11 @@ -132,5 +133,44 @@ 1.12 1.13 hg push http://hg.serpentine.com/tutorial/hello 1.14 1.15 -#$ name: 1.16 -exit 0 1.17 +#$ name: merge.clone 1.18 + 1.19 +cd .. 1.20 +hg clone hello my-new-hello 1.21 +cd my-new-hello 1.22 +sed -i '/printf/i\\tprintf("once more, hello.\\n");' hello.c 1.23 +hg commit -m 'A new hello for a new day.' 1.24 + 1.25 +#$ name: merge.cat 1.26 + 1.27 +cat hello.c 1.28 +cat ../my-hello/hello.c 1.29 + 1.30 +#$ name: merge.pull 1.31 + 1.32 +hg pull ../my-hello 1.33 + 1.34 +#$ name: merge.heads 1.35 + 1.36 +hg heads 1.37 + 1.38 +#$ name: merge.update 1.39 + 1.40 +hg update 1.41 + 1.42 +#$ name: merge.merge 1.43 + 1.44 +hg merge 1.45 + 1.46 +#$ name: merge.parents 1.47 + 1.48 +hg parents 1.49 +cat hello.c 1.50 + 1.51 +#$ name: merge.commit 1.52 + 1.53 +hg commit -m 'Merged changes' 1.54 + 1.55 +#$ name: merge.tip 1.56 + 1.57 +hg tip