diff hgext/histedit.py @ 35414:a51541681b8d

merge with stable

--- a/hgext/histedit.py	Thu Dec 14 20:18:15 2017 +0000
+++ b/hgext/histedit.py	Thu Dec 14 16:01:28 2017 -0500
@@ -488,6 +488,7 @@
         repo.ui.pushbuffer(error=True, labeled=True)
         hg.update(repo, self.state.parentctxnode, quietempty=True)
         stats = applychanges(repo.ui, repo, rulectx, {})
+        repo.dirstate.setbranch(rulectx.branch())
         if stats and stats[3] > 0:
             buf = repo.ui.popbuffer()
             repo.ui.write(*buf)