Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with fix in 2.3 stable
authorPierre-Yves David <pierre-yves.david@logilab.fr>
Mon, 03 Dec 2012 15:11:09 +0100
branchstable
changeset 626 896463193675
parent 621 e50a5d9a6cbf (current diff)
parent 623 07d813af96c4 (diff)
child 627 28d79c21cc3a
merge with fix in 2.3
hgext/evolve.py file | annotate | diff | comparison | revisions
tests/test-obsolete.t file | annotate | diff | comparison | revisions 
--- a/hgext/evolve.py	Tue Nov 27 14:27:50 2012 +0100
+++ b/hgext/evolve.py	Mon Dec 03 15:11:09 2012 +0100
@@ -857,7 +857,7 @@
     ret = orig(ui, repo, *args, **kwargs)
     nbunstable = len(getrevs(repo, 'unstable'))
     nbbumped = len(getrevs(repo, 'bumped'))
-    nbdivergent = len(getrevs(repo, 'unstable'))
+    nbdivergent = len(getrevs(repo, 'divergent'))
     write('unstable: %i changesets\n', nbunstable)
     write('bumped: %i changesets\n', nbbumped)
     write('divergent: %i changesets\n', nbdivergent)
--- a/tests/test-obsolete-divergent.t	Tue Nov 27 14:27:50 2012 +0100
+++ b/tests/test-obsolete-divergent.t	Mon Dec 03 15:11:09 2012 +0100
@@ -81,6 +81,16 @@
   $ hg log -r 'divergent()'
   2:82623d38b9ba A_1
   3:392fd25390da A_2
+  $ hg summary -v
+  parent: 0:d20a80d4def3 
+   base
+  branch: default
+  commit: (clean)
+  update: 3 new changesets (update)
+  unstable: 0 changesets
+  bumped: 0 changesets
+  divergent: 2 changesets
+
 
 check that mercurial refuse to push
 
--- a/tests/test-obsolete.t	Tue Nov 27 14:27:50 2012 +0100
+++ b/tests/test-obsolete.t	Mon Dec 03 15:11:09 2012 +0100
@@ -376,7 +376,6 @@
   commit: 1 deleted, 2 unknown (clean)
   update: 4 new changesets, 4 branch heads (merge)
   unstable: 1 changesets
-  divergent: 1 changesets
   $ qlog
   6
   - 909a0fb57e5d
evolve