Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-mq.out @ 2748:752b9475a700
New mq command qfold: Merge patches into the current patch.
Patches should be in the series file but not yet applied.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 31 Jul 2006 20:33:56 -0700 |
parents | 0016fc748f61 |
children | 8c814c1ab31e |
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 | |
42 qrestore restore the queue state saved by a rev | |
43 qsave save current queue state | |
44 qseries print the entire series file | |
45 qtop print the name of the current patch | |
46 qunapplied print the patches not yet applied | |
47 qversion print the version number | |
48 strip strip a revision and all later revs on the same branch | |
49 adding a | |
50 adding b/z | |
51 % qinit | |
52 % -R qinit | |
53 % qinit -c | |
54 A .hgignore | |
55 A series | |
56 % qnew implies add | |
57 A .hgignore | |
58 A series | |
59 A test.patch | |
60 % qnew -m | |
61 foo bar | |
62 % qrefresh | |
63 foo bar | |
64 | |
65 diff -r xa | |
66 --- a/a | |
67 +++ b/a | |
68 @@ -1,1 +1,2 @@ a | |
69 a | |
70 +a | |
71 % qpop | |
72 Patch queue now empty | |
73 % qpush | |
74 applying test.patch | |
75 Now at: test.patch | |
76 % pop/push outside repo | |
77 Patch queue now empty | |
78 applying test.patch | |
79 Now at: test.patch | |
80 % qrefresh in subdir | |
81 % pop/push -a in subdir | |
82 Patch queue now empty | |
83 applying test.patch | |
84 applying test2.patch | |
85 Now at: test2.patch | |
86 % qseries | |
87 test.patch | |
88 test2.patch | |
89 % qapplied | |
90 test.patch | |
91 test2.patch | |
92 % qtop | |
93 test2.patch | |
94 % qprev | |
95 test.patch | |
96 % qnext | |
97 All patches applied | |
98 % pop, qnext, qprev, qapplied | |
99 Now at: test.patch | |
100 test2.patch | |
101 Only one patch applied | |
102 test.patch | |
103 % qunapplied | |
104 test2.patch | |
105 % strip | |
106 adding x | |
107 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
108 saving bundle to | |
109 adding changesets | |
110 adding manifests | |
111 adding file changes | |
112 added 1 changesets with 1 changes to 1 files | |
113 (run 'hg update' to get a working copy) |