upstream/mercurial-mirror Files · mercurial/help

resolve: do not crash on empty mergestate...

resolve: do not crash on empty mergestate I managed to get an empty .hg/merge/state file by interrupting a merge by pressing Control-C. This lead to this error: TypeError: a2b_hex() argument 1 must be string or read-only buffer, not None since localnode is assigned None before the iteration over lines in the mergestate begins.

Martin Geisler -


            r11451:51021f4c

stable

Name	Size	Modified	Last Commit	Author
/ mercurial / help
config.txt	Loading ...
dates.txt	Loading ...
diffs.txt	Loading ...
environment.txt	Loading ...
extensions.txt	Loading ...
glossary.txt	Loading ...
hgweb.txt	Loading ...
multirevs.txt	Loading ...
patterns.txt	Loading ...
revisions.txt	Loading ...
revsets.txt	Loading ...
templates.txt	Loading ...
urls.txt	Loading ...

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages