Show More
@@ -1,129 +1,129 b'' | |||||
1 | % help |
|
1 | % help | |
2 | mq extension - patch management and development |
|
2 | mq extension - patch management and development | |
3 |
|
3 | |||
4 | This extension lets you work with a stack of patches in a Mercurial |
|
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 |
|
5 | repository. It manages two stacks of patches - all known patches, and | |
6 | applied patches (subset of known patches). |
|
6 | applied patches (subset of known patches). | |
7 |
|
7 | |||
8 | Known patches are represented as patch files in the .hg/patches |
|
8 | Known patches are represented as patch files in the .hg/patches | |
9 | directory. Applied patches are both patch files and changesets. |
|
9 | directory. Applied patches are both patch files and changesets. | |
10 |
|
10 | |||
11 | Common tasks (use "hg help command" for more details): |
|
11 | Common tasks (use "hg help command" for more details): | |
12 |
|
12 | |||
13 | prepare repository to work with patches qinit |
|
13 | prepare repository to work with patches qinit | |
14 | create new patch qnew |
|
14 | create new patch qnew | |
15 | import existing patch qimport |
|
15 | import existing patch qimport | |
16 |
|
16 | |||
17 | print patch series qseries |
|
17 | print patch series qseries | |
18 | print applied patches qapplied |
|
18 | print applied patches qapplied | |
19 | print name of top applied patch qtop |
|
19 | print name of top applied patch qtop | |
20 |
|
20 | |||
21 | add known patch to applied stack qpush |
|
21 | add known patch to applied stack qpush | |
22 | remove patch from applied stack qpop |
|
22 | remove patch from applied stack qpop | |
23 | refresh contents of top applied patch qrefresh |
|
23 | refresh contents of top applied patch qrefresh | |
24 |
|
24 | |||
25 | list of commands (use "hg help -v mq" to show aliases and global options): |
|
25 | list of commands (use "hg help -v mq" to show aliases and global options): | |
26 |
|
26 | |||
27 | qapplied print the patches already applied |
|
27 | qapplied print the patches already applied | |
28 | qclone clone main and patch repository at same time |
|
28 | qclone clone main and patch repository at same time | |
29 | qcommit commit changes in the queue repository |
|
29 | qcommit commit changes in the queue repository | |
30 |
qdelete remove |
|
30 | qdelete remove patches from queue | |
31 | qdiff diff of the current patch |
|
31 | qdiff diff of the current patch | |
32 | qfold fold the named patches into the current patch |
|
32 | qfold fold the named patches into the current patch | |
33 | qguard set or print guards for a patch |
|
33 | qguard set or print guards for a patch | |
34 | qheader Print the header of the topmost or specified patch |
|
34 | qheader Print the header of the topmost or specified patch | |
35 | qimport import a patch |
|
35 | qimport import a patch | |
36 | qinit init a new queue repository |
|
36 | qinit init a new queue repository | |
37 | qnew create a new patch |
|
37 | qnew create a new patch | |
38 | qnext print the name of the next patch |
|
38 | qnext print the name of the next patch | |
39 | qpop pop the current patch off the stack |
|
39 | qpop pop the current patch off the stack | |
40 | qprev print the name of the previous patch |
|
40 | qprev print the name of the previous patch | |
41 | qpush push the next patch onto the stack |
|
41 | qpush push the next patch onto the stack | |
42 | qrefresh update the current patch |
|
42 | qrefresh update the current patch | |
43 | qrename rename a patch |
|
43 | qrename rename a patch | |
44 | qrestore restore the queue state saved by a rev |
|
44 | qrestore restore the queue state saved by a rev | |
45 | qsave save current queue state |
|
45 | qsave save current queue state | |
46 | qselect set or print guarded patches to push |
|
46 | qselect set or print guarded patches to push | |
47 | qseries print the entire series file |
|
47 | qseries print the entire series file | |
48 | qtop print the name of the current patch |
|
48 | qtop print the name of the current patch | |
49 | qunapplied print the patches not yet applied |
|
49 | qunapplied print the patches not yet applied | |
50 | strip strip a revision and all later revs on the same branch |
|
50 | strip strip a revision and all later revs on the same branch | |
51 | adding a |
|
51 | adding a | |
52 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
52 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
53 | adding b/z |
|
53 | adding b/z | |
54 | % qinit |
|
54 | % qinit | |
55 | % -R qinit |
|
55 | % -R qinit | |
56 | % qinit -c |
|
56 | % qinit -c | |
57 | A .hgignore |
|
57 | A .hgignore | |
58 | A series |
|
58 | A series | |
59 | % qnew implies add |
|
59 | % qnew implies add | |
60 | A .hgignore |
|
60 | A .hgignore | |
61 | A series |
|
61 | A series | |
62 | A test.patch |
|
62 | A test.patch | |
63 | % qnew -m |
|
63 | % qnew -m | |
64 | foo bar |
|
64 | foo bar | |
65 | % qrefresh |
|
65 | % qrefresh | |
66 | foo bar |
|
66 | foo bar | |
67 |
|
67 | |||
68 | diff -r xa |
|
68 | diff -r xa | |
69 | --- a/a |
|
69 | --- a/a | |
70 | +++ b/a |
|
70 | +++ b/a | |
71 | @@ -1,1 +1,2 @@ a |
|
71 | @@ -1,1 +1,2 @@ a | |
72 | a |
|
72 | a | |
73 | +a |
|
73 | +a | |
74 | % qpop |
|
74 | % qpop | |
75 | Patch queue now empty |
|
75 | Patch queue now empty | |
76 | % qpush |
|
76 | % qpush | |
77 | applying test.patch |
|
77 | applying test.patch | |
78 | Now at: test.patch |
|
78 | Now at: test.patch | |
79 | % pop/push outside repo |
|
79 | % pop/push outside repo | |
80 | Patch queue now empty |
|
80 | Patch queue now empty | |
81 | applying test.patch |
|
81 | applying test.patch | |
82 | Now at: test.patch |
|
82 | Now at: test.patch | |
83 | % qrefresh in subdir |
|
83 | % qrefresh in subdir | |
84 | % pop/push -a in subdir |
|
84 | % pop/push -a in subdir | |
85 | Patch queue now empty |
|
85 | Patch queue now empty | |
86 | applying test.patch |
|
86 | applying test.patch | |
87 | applying test2.patch |
|
87 | applying test2.patch | |
88 | Now at: test2.patch |
|
88 | Now at: test2.patch | |
89 | % qseries |
|
89 | % qseries | |
90 | test.patch |
|
90 | test.patch | |
91 | test2.patch |
|
91 | test2.patch | |
92 | % qapplied |
|
92 | % qapplied | |
93 | test.patch |
|
93 | test.patch | |
94 | test2.patch |
|
94 | test2.patch | |
95 | % qtop |
|
95 | % qtop | |
96 | test2.patch |
|
96 | test2.patch | |
97 | % qprev |
|
97 | % qprev | |
98 | test.patch |
|
98 | test.patch | |
99 | % qnext |
|
99 | % qnext | |
100 | All patches applied |
|
100 | All patches applied | |
101 | % pop, qnext, qprev, qapplied |
|
101 | % pop, qnext, qprev, qapplied | |
102 | Now at: test.patch |
|
102 | Now at: test.patch | |
103 | test2.patch |
|
103 | test2.patch | |
104 | Only one patch applied |
|
104 | Only one patch applied | |
105 | test.patch |
|
105 | test.patch | |
106 | % commit should fail |
|
106 | % commit should fail | |
107 | abort: cannot commit over an applied mq patch |
|
107 | abort: cannot commit over an applied mq patch | |
108 | % push should fail |
|
108 | % push should fail | |
109 | pushing to ../../k |
|
109 | pushing to ../../k | |
110 | abort: source has mq patches applied |
|
110 | abort: source has mq patches applied | |
111 | % qunapplied |
|
111 | % qunapplied | |
112 | test2.patch |
|
112 | test2.patch | |
113 | % push should succeed |
|
113 | % push should succeed | |
114 | Patch queue now empty |
|
114 | Patch queue now empty | |
115 | pushing to ../../k |
|
115 | pushing to ../../k | |
116 | searching for changes |
|
116 | searching for changes | |
117 | adding changesets |
|
117 | adding changesets | |
118 | adding manifests |
|
118 | adding manifests | |
119 | adding file changes |
|
119 | adding file changes | |
120 | added 1 changesets with 1 changes to 1 files |
|
120 | added 1 changesets with 1 changes to 1 files | |
121 | % strip |
|
121 | % strip | |
122 | adding x |
|
122 | adding x | |
123 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
123 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
124 | saving bundle to |
|
124 | saving bundle to | |
125 | adding changesets |
|
125 | adding changesets | |
126 | adding manifests |
|
126 | adding manifests | |
127 | adding file changes |
|
127 | adding file changes | |
128 | added 1 changesets with 1 changes to 1 files |
|
128 | added 1 changesets with 1 changes to 1 files | |
129 | (run 'hg update' to get a working copy) |
|
129 | (run 'hg update' to get a working copy) |
General Comments 0
You need to be logged in to leave comments.
Login now