equal
deleted
inserted
replaced
23 > } |
23 > } |
24 |
24 |
25 $ hg init repo |
25 $ hg init repo |
26 $ cd repo |
26 $ cd repo |
27 $ hg help pick |
27 $ hg help pick |
28 hg pick [-r] rev |
28 hg pick [OPTION]... [-r] REV |
29 |
29 |
30 aliases: grab |
30 aliases: grab |
31 |
31 |
32 move a commit on the top of working directory parent and updates to it. |
32 move a commit on the top of working directory parent and updates to it. |
33 |
33 |
165 | |
165 | |
166 o 3:8e224524cd09 add x |
166 o 3:8e224524cd09 add x |
167 | |
167 | |
168 o 0:1f0dee641bb7 add a |
168 o 0:1f0dee641bb7 add a |
169 |
169 |
|
170 |
|
171 there were no changes to commit, so there shouldn't be any predecessors of 6, |
|
172 and 2 should say it was pruned (issue6093) |
|
173 |
|
174 $ hg olog --all --hidden -r 2+6 |
|
175 x 4538525df7e2 (2) add c |
|
176 pruned using pick by test (Thu Jan 01 00:00:00 1970 +0000) |
|
177 |
|
178 @ c4636a81ebeb (6) add c |
|
179 |
|
180 |
170 interrupted pick |
181 interrupted pick |
171 |
182 |
172 $ hg up d46dc301d92f |
183 $ hg up d46dc301d92f |
173 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
184 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
174 $ echo foo > c |
185 $ echo foo > c |