Submitter | phabricator |
---|---|
Date | Jan. 24, 2020, 5:36 p.m. |
Message ID | <differential-rev-PHID-DREV-ygojg627ovenz2iqirnc-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/44615/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -1040,10 +1040,10 @@ def clean(repo, node, show_stats=True, quietempty=False): """forcibly switch the working directory to node, clobbering changes""" stats = updaterepo(repo, node, True) + assert stats.unresolvedcount == 0 repo.vfs.unlinkpath(b'graftstate', ignoremissing=True) if show_stats: _showstats(repo, stats, quietempty) - return stats.unresolvedcount > 0 # naming conflict in updatetotally()