Commits

Pierre-Yves David  committed 72642a6

evolve: warn on conflicting changeset too

  • Participants
  • Parent commits bd26eb9
  • Branches stable

Comments (0)

Files changed (1)

File hgext/evolve.py

     """display warning is the command resulted in more instable changeset"""
     priorunstables = len(repo.revs('unstable()'))
     priorlatecomers = len(repo.revs('latecomer()'))
+    priorconflictings = len(repo.revs('conflicting()'))
     #print orig, priorunstables
     #print len(repo.revs('secret() - obsolete()'))
     try:
     finally:
         newunstables = len(repo.revs('unstable()')) - priorunstables
         newlatecomers = len(repo.revs('latecomer()')) - priorlatecomers
+        newconflictings = len(repo.revs('conflicting()')) - priorconflictings
         #print orig, newunstables
         #print len(repo.revs('secret() - obsolete()'))
         if newunstables > 0:
             ui.warn(_('%i new unstables changesets\n') % newunstables)
         if newlatecomers > 0:
             ui.warn(_('%i new latecomers changesets\n') % newlatecomers)
+        if newconflictings > 0:
+            ui.warn(_('%i new conflictings changesets\n') % newconflictings)
 
 ### changeset rewriting logic
 #############################