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