# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1348068607 -7200
# Node ID 31efc36f3aacb87bfaf72d9388ed63e23c7a78ea
# Parent  1c45a07dda51173fe1ee97c698571c701fe4f9bf
rebase: warn about troubles created by rebase

The previous order created obsolete marker after checking for new troubles

diff -r 1c45a07dda51 -r 31efc36f3aac README
--- a/README	Wed Sep 19 14:53:24 2012 +0200
+++ b/README	Wed Sep 19 17:30:07 2012 +0200
@@ -46,6 +46,10 @@
 Changelog
 ==================
 
+ --
+
+- fix troubles creation reporting from rebase
+
 1.0.2 --
 
 - fix hg fold bug
diff -r 1c45a07dda51 -r 31efc36f3aac hgext/evolve.py
--- a/hgext/evolve.py	Wed Sep 19 14:53:24 2012 +0200
+++ b/hgext/evolve.py	Wed Sep 19 17:30:07 2012 +0200
@@ -1115,11 +1115,11 @@
     try:
         rebase = extensions.find('rebase')
         if rebase:
+            extensions.wrapcommand(rebase.cmdtable, "rebase", cmdrebase)
             entry = extensions.wrapcommand(rebase.cmdtable, 'rebase', warnobserrors)
             extensions.wrapfunction(rebase, 'buildstate', buildstate)
             extensions.wrapfunction(rebase, 'defineparents', defineparents)
             extensions.wrapfunction(rebase, 'concludenode', concludenode)
-            extensions.wrapcommand(rebase.cmdtable, "rebase", cmdrebase)
     except KeyError:
         pass  # rebase not found
 
diff -r 1c45a07dda51 -r 31efc36f3aac tests/test-obsolete.t
--- a/tests/test-obsolete.t	Wed Sep 19 14:53:24 2012 +0200
+++ b/tests/test-obsolete.t	Wed Sep 19 17:30:07 2012 +0200
@@ -498,6 +498,7 @@
   nothing to rebase
   [1]
   $ hg rebase -b 3 -d 4 --traceback
+  2 new conflicting changesets
   $ hg log -G -r 'not extinct()'  --template='{rev} - {node|short}\n'
   @  11 - 9468a5f5d8b2
   |