hgbook
annotate en/examples/mq.tutorial @ 115:b74102b56df5
Wow! Lots more work detailing the working directory, merging, etc.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Mon Nov 13 16:19:48 2006 -0800 (2006-11-13) |
| parents | 6f37e6a7d8cd |
| children | ceaca14e49f0 |
| rev | line source |
|---|---|
| bos@47 | 1 #!/bin/bash |
| bos@47 | 2 |
| bos@7 | 3 echo '[extensions]' >> $HGRC |
| bos@7 | 4 echo 'hgext.mq =' >> $HGRC |
| bos@7 | 5 |
| bos@7 | 6 #$ name: qinit |
| bos@7 | 7 |
| bos@8 | 8 hg init mq-sandbox |
| bos@7 | 9 cd mq-sandbox |
| bos@8 | 10 echo 'line 1' > file1 |
| bos@8 | 11 echo 'another line 1' > file2 |
| bos@8 | 12 hg add file1 file2 |
| bos@8 | 13 hg commit -m'first change' |
| bos@7 | 14 |
| bos@7 | 15 hg qinit |
| bos@7 | 16 |
| bos@7 | 17 #$ name: qnew |
| bos@7 | 18 |
| bos@7 | 19 hg tip |
| bos@7 | 20 hg qnew first.patch |
| bos@8 | 21 hg tip |
| bos@7 | 22 ls .hg/patches |
| bos@7 | 23 |
| bos@8 | 24 #$ name: qrefresh |
| bos@8 | 25 |
| bos@8 | 26 echo 'line 2' >> file1 |
| bos@8 | 27 hg diff |
| bos@8 | 28 hg qrefresh |
| bos@8 | 29 hg diff |
| bos@8 | 30 hg tip --style=compact --patch |
| bos@8 | 31 |
| bos@8 | 32 #$ name: qrefresh2 |
| bos@8 | 33 |
| bos@8 | 34 echo 'line 3' >> file1 |
| bos@8 | 35 hg status |
| bos@8 | 36 hg qrefresh |
| bos@8 | 37 hg tip --style=compact --patch |
| bos@8 | 38 |
| bos@8 | 39 #$ name: qnew2 |
| bos@8 | 40 |
| bos@8 | 41 hg qnew second.patch |
| bos@8 | 42 hg log --style=compact --limit=2 |
| bos@8 | 43 echo 'line 4' >> file1 |
| bos@8 | 44 hg qrefresh |
| bos@8 | 45 hg tip --style=compact --patch |
| bos@8 | 46 hg annotate file1 |
| bos@8 | 47 |
| bos@8 | 48 #$ name: qseries |
| bos@8 | 49 |
| bos@8 | 50 hg qseries |
| bos@8 | 51 hg qapplied |
| bos@8 | 52 |
| bos@8 | 53 #$ name: qpop |
| bos@8 | 54 |
| bos@8 | 55 hg qapplied |
| bos@8 | 56 hg qpop |
| bos@8 | 57 hg qseries |
| bos@8 | 58 hg qapplied |
| bos@8 | 59 cat file1 |
| bos@27 | 60 |
| bos@27 | 61 #$ name: qpush-a |
| bos@27 | 62 |
| bos@27 | 63 hg qpush -a |
| bos@8 | 64 cat file1 |
| bos@27 | 65 |
| bos@27 | 66 #$ name: add |
| bos@27 | 67 |
| bos@27 | 68 echo 'file 3, line 1' >> file3 |
| bos@27 | 69 hg qnew add-file3.patch |
| bos@27 | 70 hg qnew -f add-file3.patch |
| bos@74 | 71 |
| bos@74 | 72 #$ name: |
| bos@74 | 73 exit 0 |