Commits

Pierre-Yves David committed 31efc36

rebase: warn about troubles created by rebase

The previous order created obsolete marker after checking for new troubles

  • Participants
  • Parent commits 1c45a07

Comments (0)

Files changed (3)

 Changelog
 ==================
 
+ --
+
+- fix troubles creation reporting from rebase
+
 1.0.2 --
 
 - fix hg fold bug

File hgext/evolve.py

     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
 

File tests/test-obsolete.t

   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
   |