Mercurial > hg-stable
changeset 49385:34e15bbab67c stable
mergestate: action name was str
Apparently the standard for them is still to use byte strings.
Found while looking at something else
author | Georges Racinet <georges.racinet@octobus.net> |
---|---|
date | Tue, 19 Jul 2022 12:41:46 +0200 |
parents | 4a1f0bc0713e |
children | 9d427cc2e742 |
files | mercurial/mergestate.py |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/mergestate.py Wed Jul 13 18:27:40 2022 +0200 +++ b/mercurial/mergestate.py Tue Jul 19 12:41:46 2022 +0200 @@ -159,7 +159,7 @@ ACTION_ADD = MergeAction(b'a', narrow_safe=True, changes=CHANGE_ADDED) ACTION_GET = MergeAction(b'g', narrow_safe=True, changes=CHANGE_MODIFIED) ACTION_PATH_CONFLICT = MergeAction(b'p') -ACTION_PATH_CONFLICT_RESOLVE = MergeAction('pr') +ACTION_PATH_CONFLICT_RESOLVE = MergeAction(b'pr') ACTION_ADD_MODIFIED = MergeAction( b'am', narrow_safe=True, changes=CHANGE_ADDED ) # not 100% about the changes value here