From efe7db9db18d30ec984c354578d9a2c2ed734019 Mon Sep 17 00:00:00 2001
From: Sean Farley <sean.michael.farley@gmail.com>
Date: Thu, 12 Feb 2015 13:24:41 -0800
Subject: [PATCH] push: only list non-obsolete heads in ui message

---
 remotenames.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/remotenames.py b/remotenames.py
index d6904494fd..c45135520d 100644
--- a/remotenames.py
+++ b/remotenames.py
@@ -221,7 +221,8 @@ def expushdiscoverybookmarks(pushop):
                 revs.remove(rev)
         if revs:
             msg = _("push would create new anonymous heads (%s)" %
-                    ', '.join([short(r) for r in revs]))
+                    ', '.join([short(r) for r in revs
+                               if not repo[r].obsolete()]))
             hint = _("use 'hg push --to NAME' to create a new remote bookmark")
             raise util.Abort(msg, hint=hint)