# HG changeset patch # User Pierre-Yves David # Date 1416526439 28800 # Node ID 4697f23e0edef12b810f00b1cb26235019357bf1 # Parent 6f08a8f6bb1d611cdf3fe05710917a7a39d5c81f debugobsconvert: fix a typo on "version" diff -r 6f08a8f6bb1d -r 4697f23e0ede hgext/evolve.py --- a/hgext/evolve.py Thu Nov 20 15:33:14 2014 -0800 +++ b/hgext/evolve.py Thu Nov 20 15:33:59 2014 -0800 @@ -2773,7 +2773,7 @@ continue know.add(m) markers.append(m) - ui.write(_('Old store is version %d, will rewrite in verion %d\n') % ( + ui.write(_('Old store is version %d, will rewrite in version %d\n') % ( repo.obsstore._version, new_format)) map(f.write, obsolete.encodemarkers(markers, True, new_format)) f.close() diff -r 6f08a8f6bb1d -r 4697f23e0ede tests/test-obsconvert.t --- a/tests/test-obsconvert.t Thu Nov 20 15:33:14 2014 -0800 +++ b/tests/test-obsconvert.t Thu Nov 20 15:33:59 2014 -0800 @@ -16,19 +16,19 @@ Test conversion between obsolete marker formats $ hg debugobsconvert --new-format 0 - Old store is version 1, will rewrite in verion 0 + Old store is version 1, will rewrite in version 0 Done! $ hg debugobsconvert --new-format 0 abort: New format is the same as the old format, not upgrading! [255] $ hg debugobsconvert --new-format 1 - Old store is version 0, will rewrite in verion 1 + Old store is version 0, will rewrite in version 1 Done! Test that the default is some reasonably modern format (first downgrade) $ hg debugobsconvert --new-format 0 - Old store is version 1, will rewrite in verion 0 + Old store is version 1, will rewrite in version 0 Done! $ hg debugobsconvert - Old store is version 0, will rewrite in verion * (glob) + Old store is version 0, will rewrite in version 1 Done!