upstream/mercurial-mirror Files · hgext/fastannotate

RhodeCode Free Hosting

0

- This repo
- ?
- Use '/' key to quickly access this field. - Enter a name of repository, or repository group for quick search. - Prefix query to allow special search: user:admin, to search for usernames, always global user_group:devops, to search for user groups, always global pr:303, to search for pull request number, title, or description, always global commit:efced4, to search for commits, scoped to repositories or groups file:models.py, to search for file paths, scoped to repositories or groups For advanced full text search visit: repository search
Home
Public journal
Gists
Sign in

upstream » mercurial-mirror

RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

mergestate: fix BC breakage introduced because of removal of a merge record...

mergestate: fix BC breakage introduced because of removal of a merge record In I removed the usage of RECORD_RESOLVED_OTHER. However I also removed the reading support, hence if there is any user who runs into merge conflict with older version of hg, upgrades hg and then tries to read mergestate, they will end up with an MergeRecordUnsupportedError.

Pulkit Goyal -


            r45859:7fc3c5fb

Name	Size	Modified	Last Commit	Author
/ hgext / fastannotate
__init__.py	Loading ...
commands.py	Loading ...
context.py	Loading ...
error.py	Loading ...
formatter.py	Loading ...
protocol.py	Loading ...
revmap.py	Loading ...
support.py	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