Mercurial > hg
comparison tests/test-bisect.t @ 32131:35a69efbf190
bisect: allow resetting with unfinished graft/rebase/etc
"hg bisect --reset" just deletes the state file (it doesn't move back
to the starting point like rebase does); it can not conflict with an
ongoing rebase etc.
checkunfinished() has this documentation:
It's probably good to check this right before bailifchanged().
So that's where I moved it.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 03 May 2017 09:09:44 -0700 |
parents | d83ca854fa21 |
children | fbe9c4dcc8a0 |
comparison
equal
deleted
inserted
replaced
32130:c3dcec6cbc1b | 32131:35a69efbf190 |
---|---|
549 changeset: 6:a3d5c6fdf0d3 | 549 changeset: 6:a3d5c6fdf0d3 |
550 user: test | 550 user: test |
551 date: Thu Jan 01 00:00:06 1970 +0000 | 551 date: Thu Jan 01 00:00:06 1970 +0000 |
552 summary: msg 6 | 552 summary: msg 6 |
553 | 553 |
554 | 554 $ hg graft -q 15 |
555 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | |
556 abort: unresolved conflicts, can't continue | |
557 (use 'hg resolve' and 'hg graft --continue') | |
558 [255] | |
559 $ hg bisect --reset | |
560 $ hg up -C . | |
561 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
555 | 562 |
556 Check that bisect does not break on obsolete changesets | 563 Check that bisect does not break on obsolete changesets |
557 ========================================================= | 564 ========================================================= |
558 | 565 |
559 $ cat >> $HGRCPATH << EOF | 566 $ cat >> $HGRCPATH << EOF |