Mercurial > hg > gitweb
annotate tests/test-mq.out @ 2758:c9359142cba3
fix mq test output.
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Tue, 01 Aug 2006 15:40:54 -0700 |
| parents | 8c814c1ab31e |
| children | 2e4ace008c94 |
| rev | line source |
|---|---|
| 2729 | 1 % help |
| 2 mq extension - patch management and development | |
| 3 | |
| 4 This extension lets you work with a stack of patches in a Mercurial | |
| 5 repository. It manages two stacks of patches - all known patches, and | |
| 6 applied patches (subset of known patches). | |
| 7 | |
| 8 Known patches are represented as patch files in the .hg/patches | |
| 9 directory. Applied patches are both patch files and changesets. | |
| 10 | |
| 11 Common tasks (use "hg help command" for more details): | |
| 12 | |
| 13 prepare repository to work with patches qinit | |
| 14 create new patch qnew | |
| 15 import existing patch qimport | |
| 16 | |
| 17 print patch series qseries | |
| 18 print applied patches qapplied | |
| 19 print name of top applied patch qtop | |
| 20 | |
| 21 add known patch to applied stack qpush | |
| 22 remove patch from applied stack qpop | |
| 23 refresh contents of top applied patch qrefresh | |
| 24 | |
| 25 list of commands (use "hg help -v mq" to show aliases and global options): | |
| 26 | |
| 27 qapplied print the patches already applied | |
| 28 qclone clone main and patch repository at same time | |
| 29 qcommit commit changes in the queue repository | |
| 30 qdelete remove a patch from the series file | |
| 31 qdiff diff of the current patch | |
|
2748
752b9475a700
New mq command qfold: Merge patches into the current patch.
Brendan Cully <brendan@kublai.com>
parents:
2747
diff
changeset
|
32 qfold fold the named patches into the current patch |
|
2747
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2729
diff
changeset
|
33 qheader Print the header of the topmost or specified patch |
| 2729 | 34 qimport import a patch |
| 35 qinit init a new queue repository | |
| 36 qnew create a new patch | |
| 37 qnext print the name of the next patch | |
| 38 qpop pop the current patch off the stack | |
| 39 qprev print the name of the previous patch | |
| 40 qpush push the next patch onto the stack | |
| 41 qrefresh update the current patch | |
|
2750
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
42 qrename rename a patch |
| 2729 | 43 qrestore restore the queue state saved by a rev |
| 44 qsave save current queue state | |
| 45 qseries print the entire series file | |
| 46 qtop print the name of the current patch | |
| 47 qunapplied print the patches not yet applied | |
| 2758 | 48 qversion print the version number of the mq extension |
| 2729 | 49 strip strip a revision and all later revs on the same branch |
| 50 adding a | |
| 51 adding b/z | |
| 52 % qinit | |
| 53 % -R qinit | |
| 54 % qinit -c | |
| 55 A .hgignore | |
| 56 A series | |
| 57 % qnew implies add | |
| 58 A .hgignore | |
| 59 A series | |
| 60 A test.patch | |
| 61 % qnew -m | |
| 62 foo bar | |
| 63 % qrefresh | |
| 64 foo bar | |
| 65 | |
| 66 diff -r xa | |
| 67 --- a/a | |
| 68 +++ b/a | |
| 69 @@ -1,1 +1,2 @@ a | |
| 70 a | |
| 71 +a | |
| 72 % qpop | |
| 73 Patch queue now empty | |
| 74 % qpush | |
| 75 applying test.patch | |
| 76 Now at: test.patch | |
| 77 % pop/push outside repo | |
| 78 Patch queue now empty | |
| 79 applying test.patch | |
| 80 Now at: test.patch | |
| 81 % qrefresh in subdir | |
| 82 % pop/push -a in subdir | |
| 83 Patch queue now empty | |
| 84 applying test.patch | |
| 85 applying test2.patch | |
| 86 Now at: test2.patch | |
| 87 % qseries | |
| 88 test.patch | |
| 89 test2.patch | |
| 90 % qapplied | |
| 91 test.patch | |
| 92 test2.patch | |
| 93 % qtop | |
| 94 test2.patch | |
| 95 % qprev | |
| 96 test.patch | |
| 97 % qnext | |
| 98 All patches applied | |
| 99 % pop, qnext, qprev, qapplied | |
| 100 Now at: test.patch | |
| 101 test2.patch | |
| 102 Only one patch applied | |
| 103 test.patch | |
| 104 % qunapplied | |
| 105 test2.patch | |
| 106 % strip | |
| 107 adding x | |
| 108 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 109 saving bundle to | |
| 110 adding changesets | |
| 111 adding manifests | |
| 112 adding file changes | |
| 113 added 1 changesets with 1 changes to 1 files | |
| 114 (run 'hg update' to get a working copy) |