Mercurial > evolve

comparison tests/test-pick.t @ 6187:df8df57a3ce3 mercurial-5.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.1 into mercurial-5.0
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 22 Feb 2022 18:21:24 +0300
parents e6ae5af97683 d97d5ab35b96
children 716912541759
comparison
equal deleted inserted replaced
6186:c915d9441654 6187:df8df57a3ce3
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"
87 Aborting without interrupted pick 87 Aborting without interrupted pick
88 88
89 $ hg pick --abort 89 $ hg pick --abort
90 abort: no interrupted pick state exists 90 abort: no interrupted pick state exists
91 [255] 91 [255]
92 #if abortcommand
93 $ hg abort
94 abort: no operation in progress
95 [255]
96 #endif
97 92
98 Specifying both continue and revs 93 Specifying both continue and revs
99 94
100 $ hg up 1f0dee641bb7 95 $ hg up 1f0dee641bb7
101 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 96 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
262 merging b 257 merging b
263 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 258 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
264 unresolved merge conflicts (see hg help resolve) 259 unresolved merge conflicts (see hg help resolve)
265 [1] 260 [1]
266 261
267 #if abortcommand
268 $ hg abort --dry-run
269 pick in progress, will be aborted
270 #endif
271 $ hg abort 262 $ hg abort
272 pick aborted 263 pick aborted
273 working directory is now at c437988de89f 264 working directory is now at c437988de89f
274 265
275 $ hg glog 266 $ hg glog