# HG changeset patch
# User Patrick Mezard <patrick@mezard.eu>
# Date 1343230112 -7200
# Node ID 2c969d1b18e0e17278d317779102db94b4ddfad5
# Parent  8c92f65e0dcccb9c6d9de4bf1403b299ffe43f4f
obsolete: change warning output to match mercurial core on

The new messages were introduced by hg@12fdaa30063a.

diff -r 8c92f65e0dcc -r 2c969d1b18e0 docs/tutorials/tutorial.t
--- a/docs/tutorials/tutorial.t	Thu Jul 19 16:16:08 2012 +0200
+++ b/docs/tutorials/tutorial.t	Wed Jul 25 17:28:32 2012 +0200
@@ -609,7 +609,7 @@
   $ hg push other
   pushing to $TESTTMP/other
   searching for changes
-  abort: Trying to push unstable changeset: 9ac5d0e790a2!
+  abort: push includes an unstable changeset: 9ac5d0e790a2!
   (use 'hg stabilize' to get a stable history (or --force to proceed))
   [255]
  
diff -r 8c92f65e0dcc -r 2c969d1b18e0 hgext/obsolete.py
--- a/hgext/obsolete.py	Thu Jul 19 16:16:08 2012 +0200
+++ b/hgext/obsolete.py	Wed Jul 25 17:28:32 2012 +0200
@@ -493,16 +493,16 @@
         ctx =  repo[h]
         hint = _("use 'hg stabilize' to get a stable history (or --force to proceed)")
         if ctx.unstable():
-            raise util.Abort(_("Trying to push unstable changeset: %s!") % ctx,
+            raise util.Abort(_("push includes an unstable changeset: %s!") % ctx,
                              hint=hint)
         if ctx.obsolete():
-            raise util.Abort(_("Trying to push obsolete changeset: %s!") % ctx,
+            raise util.Abort(_("push includes an  obsolete changeset: %s!") % ctx,
                              hint=hint)
         if ctx.latecomer():
-            raise util.Abort(_("Trying to push latecomer changeset: %s!") % ctx,
+            raise util.Abort(_("push includes an latecomer changeset: %s!") % ctx,
                              hint=hint)
         if ctx.conflicting():
-            raise util.Abort(_("Trying to push conflicting changeset: %s!") % ctx,
+            raise util.Abort(_("push includes conflicting changeset: %s!") % ctx,
                              hint=hint)
     ### patch remote branch map
     # do not read it this burn eyes
diff -r 8c92f65e0dcc -r 2c969d1b18e0 tests/test-obsolete.t
--- a/tests/test-obsolete.t	Thu Jul 19 16:16:08 2012 +0200
+++ b/tests/test-obsolete.t	Wed Jul 25 17:28:32 2012 +0200
@@ -147,7 +147,7 @@
   $ hg push ../other-new
   pushing to ../other-new
   searching for changes
-  abort: Trying to push unstable changeset: a7a6f2b5d8a5!
+  abort: push includes an unstable changeset: a7a6f2b5d8a5!
   (use 'hg stabilize' to get a stable history (or --force to proceed))
   [255]
   $ hg push -f ../other-new
@@ -200,7 +200,7 @@
   $ hg push ../other-new
   pushing to ../other-new
   searching for changes
-  abort: Trying to push unstable changeset: 95de7fc6918d!
+  abort: push includes an unstable changeset: 95de7fc6918d!
   (use 'hg stabilize' to get a stable history (or --force to proceed))
   [255]
   $ hg push ../other-new -f # use f because there is unstability
@@ -269,7 +269,7 @@
   $ hg push ../other-old
   pushing to ../other-old
   searching for changes
-  abort: Trying to push unstable changeset: 909a0fb57e5d!
+  abort: push includes an unstable changeset: 909a0fb57e5d!
   (use 'hg stabilize' to get a stable history (or --force to proceed))
   [255]
   $ hg push -f ../other-old
@@ -517,7 +517,7 @@
   $ hg push ../other-new/
   pushing to ../other-new/
   searching for changes
-  abort: Trying to push latecomer changeset: 6db5e282cb91!
+  abort: push includes an latecomer changeset: 6db5e282cb91!
   (use 'hg stabilize' to get a stable history (or --force to proceed))
   [255]