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 |
246 merging b |
241 merging b |
247 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
242 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
248 unresolved merge conflicts (see hg help resolve) |
243 unresolved merge conflicts (see hg help resolve) |
249 [1] |
244 [1] |
250 |
245 |
251 #if abortcommand |
|
252 $ hg abort --dry-run |
|
253 pick in progress, will be aborted |
|
254 #endif |
|
255 $ hg abort |
246 $ hg abort |
256 aborting pick, updating to c437988de89f |
247 aborting pick, updating to c437988de89f |
257 |
248 |
258 $ hg glog |
249 $ hg glog |
259 @ 10:c437988de89f foo to b |
250 @ 10:c437988de89f foo to b |