Mercurial > evolve
changeset 623:07d813af96c4 compat-hg2.3
fix retrieval of divergent changesets in obssummary (typo)
Add a test for this; drop wrong divergent print in 'Test rollback support'.
| author | Denis Laxalde <denis.laxalde@logilab.fr> |
|---|---|
| date | Wed, 28 Nov 2012 10:19:43 +0100 |
| parents | 232536f5c987 |
| children | 896463193675 eccfd01aec56 |
| files | hgext/evolve.py tests/test-obsolete-divergent.t tests/test-obsolete.t |
| diffstat | 3 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py Thu Nov 22 11:30:36 2012 +0100 +++ b/hgext/evolve.py Wed Nov 28 10:19:43 2012 +0100 @@ -1100,7 +1100,7 @@ ret = orig(ui, repo, *args, **kwargs) nbunstable = len(getobscache(repo, 'unstable')) nbbumped = len(getobscache(repo, 'bumped')) - nbdivergent = len(getobscache(repo, 'unstable')) + nbdivergent = len(getobscache(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 Thu Nov 22 11:30:36 2012 +0100 +++ b/tests/test-obsolete-divergent.t Wed Nov 28 10:19:43 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