Mercurial > hg > compact-paper

changeset 16051:2aa5b51f310f stable 2.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
phases: don't complain if cset is already public on pushkey (issue3230)
author Matt Mackall <mpm@selenic.com>
date Wed, 01 Feb 2012 14:17:26 -0600
parents aaaa7ebc578b
children 79e37dd6c28f
files mercurial/phases.py
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/phases.py	Wed Feb 01 17:59:51 2012 -0200
+++ b/mercurial/phases.py	Wed Feb 01 14:17:26 2012 -0600
@@ -239,6 +239,9 @@
         if currentphase == oldphase and newphase < oldphase:
             advanceboundary(repo, newphase, [bin(nhex)])
             return 1
+        elif currentphase == newphase:
+            # raced, but got correct result
+            return 1
         else:
             return 0
     finally: