equal
deleted
inserted
replaced
12 mq command new equivalent |
12 mq command new equivalent |
13 ============================== ============================================ |
13 ============================== ============================================ |
14 qseries ``log`` |
14 qseries ``log`` |
15 qnew ``commit`` |
15 qnew ``commit`` |
16 qrefresh ``amend`` |
16 qrefresh ``amend`` |
|
17 qrefresh --exclude ``uncommit`` |
17 qpop ``update`` or ``gdown`` |
18 qpop ``update`` or ``gdown`` |
18 qpush ``update`` or ``gup`` sometimes ``evolve`` |
19 qpush ``update`` or ``gup`` sometimes ``evolve`` |
19 qrm ``prune`` |
20 qrm ``prune`` |
20 qfold ``fold`` |
21 qfold ``fold`` |
21 qdiff ``odiff`` |
22 qdiff ``odiff`` |
22 qrecord ``/qrecord`` |
23 qrecord ``record`` |
23 |
24 |
24 qfinish -- |
25 qfinish -- |
25 qimport -- |
26 qimport -- |
26 ============================== ============================================ |
27 ============================== ============================================ |
27 |
28 |
84 .. $ hg record -m 'feature A' |
85 .. $ hg record -m 'feature A' |
85 .. # oups, I forgot some stuff |
86 .. # oups, I forgot some stuff |
86 .. $ hg record babar.py |
87 .. $ hg record babar.py |
87 .. $ hg amend -c .^ # .^ refer to "working directoy parent, here 'feature A' |
88 .. $ hg amend -c .^ # .^ refer to "working directoy parent, here 'feature A' |
88 |
89 |
89 note: refresh is an alias for amend |
90 .. note: refresh is an alias for amend |
90 |
91 |
91 hg qref -X |
92 hg qref --exclude |
92 ```````````` |
93 ````````````````````` |
93 |
94 |
94 To remove changes from you current commit use:: |
95 To remove changes from you current commit use:: |
95 |
96 |
96 $ hg uncommit not-ready.txt |
97 $ hg uncommit not-ready.txt |
97 |
98 |
112 |
113 |
113 hg qpush |
114 hg qpush |
114 ```````` |
115 ```````` |
115 |
116 |
116 When you rewrite changesets, descendants of rewritten changesets are marked as |
117 When you rewrite changesets, descendants of rewritten changesets are marked as |
117 "out of sync". You need to rewrite them on top of the new version of their |
118 "unstable". You need to rewrite them on top of the new version of their |
118 ancestor. |
119 ancestor. |
119 |
120 |
120 The evolution extension adds a command to rewrite the "out of sync" |
121 The evolution extension adds a command to rewrite "unstable" |
121 changesets::: |
122 changesets::: |
122 |
123 |
123 $ hg evolve |
124 $ hg evolve |
124 |
125 |
125 You can also decide to do it manually using:: |
126 You can also decide to do it manually using:: |
138 ``````` |
139 ``````` |
139 |
140 |
140 evolution introduce a new command to mark a changeset as "not wanted anymore".:: |
141 evolution introduce a new command to mark a changeset as "not wanted anymore".:: |
141 |
142 |
142 $ hg prune <revset> |
143 $ hg prune <revset> |
143 |
|
144 hg qrm |
|
145 ``````` |
|
146 |
|
147 :: |
|
148 |
|
149 $ hg fold <first>::<last> |
|
150 |
144 |
151 hg qfold |
145 hg qfold |
152 ````````` |
146 ````````` |
153 |
147 |
154 |
148 |