hgbook

diff en/examples/mq.tutorial @ 8:a25335b56825

Progress on MQ tutorial.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue Jun 27 23:21:05 2006 -0700 (2006-06-27)
parents 339e75288632
children 535e87792eb1
line diff
     1.1 --- a/en/examples/mq.tutorial	Mon Jun 26 12:25:11 2006 -0700
     1.2 +++ b/en/examples/mq.tutorial	Tue Jun 27 23:21:05 2006 -0700
     1.3 @@ -3,18 +3,57 @@
     1.4  
     1.5  #$ name: qinit
     1.6  
     1.7 -hg clone http://hg.serpentine.com/mercurial/hg mq-sandbox
     1.8 -
     1.9 +hg init mq-sandbox
    1.10  cd mq-sandbox
    1.11 +echo 'line 1' > file1
    1.12 +echo 'another line 1' > file2
    1.13 +hg add file1 file2
    1.14 +hg commit -m'first change'
    1.15  
    1.16  hg qinit
    1.17  
    1.18  #$ name: qnew
    1.19  
    1.20  hg tip
    1.21 -
    1.22  hg qnew first.patch
    1.23 -
    1.24 +hg tip
    1.25  ls .hg/patches
    1.26  
    1.27 -hg tip
    1.28 +#$ name: qrefresh
    1.29 +
    1.30 +echo 'line 2' >> file1
    1.31 +hg diff
    1.32 +hg qrefresh
    1.33 +hg diff
    1.34 +hg tip --style=compact --patch
    1.35 +
    1.36 +#$ name: qrefresh2
    1.37 +
    1.38 +echo 'line 3' >> file1
    1.39 +hg status
    1.40 +hg qrefresh
    1.41 +hg tip --style=compact --patch
    1.42 +
    1.43 +#$ name: qnew2
    1.44 +
    1.45 +hg qnew second.patch
    1.46 +hg log --style=compact --limit=2
    1.47 +echo 'line 4' >> file1
    1.48 +hg qrefresh
    1.49 +hg tip --style=compact --patch
    1.50 +hg annotate file1
    1.51 +
    1.52 +#$ name: qseries
    1.53 +
    1.54 +hg qseries
    1.55 +hg qapplied
    1.56 +
    1.57 +#$ name: qpop
    1.58 +
    1.59 +hg qapplied
    1.60 +hg qpop
    1.61 +hg qseries
    1.62 +hg qapplied
    1.63 +cat file1
    1.64 +hg qpush
    1.65 +cat file1