Mercurial > hg > evolve

changeset 571:31efc36f3aac stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: warn about troubles created by rebase The previous order created obsolete marker after checking for new troubles
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Wed, 19 Sep 2012 17:30:07 +0200
parents 1c45a07dda51
children dc107acd0bd2
files README hgext/evolve.py tests/test-obsolete.t
diffstat 3 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/README
+++ b/README
@@ -46,6 +46,10 @@
 Changelog
 ==================
 
+ --
+
+- fix troubles creation reporting from rebase
+
 1.0.2 --
 
 - fix hg fold bug
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -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
 
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -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
   |