Submitter | Boris Feld |
---|---|
Date | Oct. 16, 2017, 6:23 p.m. |
Message ID | <629de091478a249c97ce.1508178222@FB> |
Download | mbox | patch |
Permalink | /patch/25016/ |
State | Accepted |
Headers | show |
Comments
Patch
diff --git a/mercurial/phases.py b/mercurial/phases.py --- a/mercurial/phases.py +++ b/mercurial/phases.py @@ -502,8 +502,10 @@ # Use ordered dictionary so behavior is deterministic. keys = util.sortdict() value = '%i' % draft + cl = repo.unfiltered().changelog for root in repo._phasecache.phaseroots[draft]: - keys[hex(root)] = value + if repo._phasecache.phase(repo, cl.rev(root)) <= draft: + keys[hex(root)] = value if repo.publishing(): # Add an extra data to let remote know we are a publishing