Mercurial > hg
annotate tests/test-mq.out @ 2846:b8d587cfa3bb
mq: test commit in repo with patches applied
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Thu, 10 Aug 2006 15:02:18 -0700 |
parents | 12139eedd6a0 |
children | 307439d6fede |
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 |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2758
diff
changeset
|
33 qguard set or print guards for a patch |
2747
0016fc748f61
Add command qheader to display the header of a given patch.
Brendan Cully <brendan@kublai.com>
parents:
2729
diff
changeset
|
34 qheader Print the header of the topmost or specified patch |
2729 | 35 qimport import a patch |
36 qinit init a new queue repository | |
37 qnew create a new patch | |
38 qnext print the name of the next patch | |
39 qpop pop the current patch off the stack | |
40 qprev print the name of the previous patch | |
41 qpush push the next patch onto the stack | |
42 qrefresh update the current patch | |
2750
8c814c1ab31e
New self-explanatory command qrename.
Brendan Cully <brendan@kublai.com>
parents:
2748
diff
changeset
|
43 qrename rename a patch |
2729 | 44 qrestore restore the queue state saved by a rev |
45 qsave save current queue state | |
2821
2e4ace008c94
mq: new commands qselect, qguard
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2758
diff
changeset
|
46 qselect set or print guarded patches to push |
2729 | 47 qseries print the entire series file |
48 qtop print the name of the current patch | |
49 qunapplied print the patches not yet applied | |
50 strip strip a revision and all later revs on the same branch | |
51 adding a | |
52 adding b/z | |
53 % qinit | |
54 % -R qinit | |
55 % qinit -c | |
56 A .hgignore | |
57 A series | |
58 % qnew implies add | |
59 A .hgignore | |
60 A series | |
61 A test.patch | |
62 % qnew -m | |
63 foo bar | |
64 % qrefresh | |
65 foo bar | |
66 | |
67 diff -r xa | |
68 --- a/a | |
69 +++ b/a | |
70 @@ -1,1 +1,2 @@ a | |
71 a | |
72 +a | |
73 % qpop | |
74 Patch queue now empty | |
75 % qpush | |
76 applying test.patch | |
77 Now at: test.patch | |
78 % pop/push outside repo | |
79 Patch queue now empty | |
80 applying test.patch | |
81 Now at: test.patch | |
82 % qrefresh in subdir | |
83 % pop/push -a in subdir | |
84 Patch queue now empty | |
85 applying test.patch | |
86 applying test2.patch | |
87 Now at: test2.patch | |
88 % qseries | |
89 test.patch | |
90 test2.patch | |
91 % qapplied | |
92 test.patch | |
93 test2.patch | |
94 % qtop | |
95 test2.patch | |
96 % qprev | |
97 test.patch | |
98 % qnext | |
99 All patches applied | |
100 % pop, qnext, qprev, qapplied | |
101 Now at: test.patch | |
102 test2.patch | |
103 Only one patch applied | |
104 test.patch | |
2846
b8d587cfa3bb
mq: test commit in repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2828
diff
changeset
|
105 % commit should fail |
b8d587cfa3bb
mq: test commit in repo with patches applied
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2828
diff
changeset
|
106 abort: cannot commit over an applied mq patch |
2729 | 107 % qunapplied |
108 test2.patch | |
109 % strip | |
110 adding x | |
111 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
112 saving bundle to | |
113 adding changesets | |
114 adding manifests | |
115 adding file changes | |
116 added 1 changesets with 1 changes to 1 files | |
117 (run 'hg update' to get a working copy) |