Submitter | phabricator |
---|---|
Date | Jan. 13, 2020, 2:19 p.m. |
Message ID | <07a500106b80986ee0c2ca21a0eab25a@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/44267/ |
State | Not Applicable |
Headers | show |
Comments
Patch
diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -2445,6 +2445,9 @@ # necessary for memctx to register a deletion. return None + if branch is None: + branch = self._wrappedctx.branch() + return memctx( self._repo, parents, diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -1430,7 +1430,7 @@ # By convention, ``extra['branch']`` (set by extrafn) clobbers # ``branch`` (used when passing ``--keepbranches``). - branch = repo[p1].branch() + branch = None if b'branch' in extra: branch = extra[b'branch']