equal
deleted
inserted
replaced
1 #testcases abortcommand abortflag |
1 #testcases abortflag |
2 Test for the pick command |
2 Test for the pick command |
3 |
3 |
4 $ cat >> $HGRCPATH <<EOF |
4 $ cat >> $HGRCPATH <<EOF |
5 > [alias] |
5 > [alias] |
6 > glog = log -G -T "{rev}:{node|short} {desc}\n" |
6 > glog = log -G -T "{rev}:{node|short} {desc}\n" |
85 Aborting without interrupted pick |
85 Aborting without interrupted pick |
86 |
86 |
87 $ hg pick --abort |
87 $ hg pick --abort |
88 abort: no interrupted pick state exists |
88 abort: no interrupted pick state exists |
89 [255] |
89 [255] |
90 #if abortcommand |
|
91 $ hg abort |
|
92 abort: no operation in progress |
|
93 [255] |
|
94 #endif |
|
95 |
90 |
96 Specifying both continue and revs |
91 Specifying both continue and revs |
97 |
92 |
98 $ hg up 1f0dee641bb7 |
93 $ hg up 1f0dee641bb7 |
99 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
94 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
257 merging b |
252 merging b |
258 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
253 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
259 unresolved merge conflicts (see hg help resolve) |
254 unresolved merge conflicts (see hg help resolve) |
260 [1] |
255 [1] |
261 |
256 |
262 #if abortcommand |
|
263 $ hg abort --dry-run |
|
264 pick in progress, will be aborted |
|
265 #endif |
|
266 $ hg abort |
257 $ hg abort |
267 aborting pick, updating to c437988de89f |
258 aborting pick, updating to c437988de89f |
268 |
259 |
269 $ hg glog |
260 $ hg glog |
270 @ 10:c437988de89f foo to b |
261 @ 10:c437988de89f foo to b |