# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2012-02-01 20:17:26
# Node ID 2aa5b51f310fb3befd26bed99c02267f5c12c734
# Parent  aaaa7ebc578bc6411e14976515bf4d882833d8b7

phases: don't complain if cset is already public on pushkey (issue3230)

diff --git a/mercurial/phases.py b/mercurial/phases.py
--- a/mercurial/phases.py
+++ b/mercurial/phases.py
@@ -239,6 +239,9 @@ def pushphase(repo, nhex, oldphasestr, n
         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: