##// END OF EJS Templates
tests: test divergence created during interrupted rebase...
tests: test divergence created during interrupted rebase If a rebase runs into conflicts and the user somehow rewrites an unrebased commit in the rebase set while the rebase is interrupted, continuing it might result in divergence. It turns out that we decide to skip the commit. That seems to make sense, but it wasn't obvious to me that that's what we should do. Either way, this patch adds a test case for the current behavior. Differential Revision: https://phab.mercurial-scm.org/D10256

File last commit:

r47543:521ac0d7 stable
r47586:6648307d default
Show More
hashutil.py
10 lines | 215 B | text/x-python | PythonLexer
Augie Fackler
hashutil: new package for hashing-related features...
r44516 from __future__ import absolute_import
import hashlib
try:
Matt Harbison
typing: disable import error warnings that are already handled...
r47543 from ..thirdparty import sha1dc # pytype: disable=import-error
Augie Fackler
hashutil: new package for hashing-related features...
r44516
sha1 = sha1dc.sha1
except (ImportError, AttributeError):
sha1 = hashlib.sha1