Mercurial > hg
comparison mercurial/templater.py @ 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 | e5eab0fe69ee |
children | 52e222eef646 |
comparison
equal
deleted
inserted
replaced
32130:c3dcec6cbc1b | 32131:35a69efbf190 |
---|