# HG changeset patch # User Pierre-Yves David # Date 1398288508 25200 # Node ID ffce88754767f91ad58889b8651bb4d9d471d0fd # Parent ff71b83a4bbe245c38069bfda902da776794d5f5# Parent 6c5a6c2706f654bbdc1e16a904cbef2a27354a32 merge with stable diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -20,3 +20,4 @@ cdb52bbbe5b8770d5e68943b7e73bee4ba136ecc 3.1.0 c3ba8a965a7a173e388d84819e936ea9bae9797f 3.2.0 83882f2fbecba0b7e7f7e5d490b57db93bd7fa22 3.3.0 +fc04758ea9f549684989ee673b04d9724756dc85 3.3.1 diff --git a/README b/README --- a/README +++ b/README @@ -52,6 +52,14 @@ - only pull markers relevant to pulled subset (if server support) - added progress support for push and pull of markers over wire protocol +3.3.1 -- 2014-04-23 + +- various language fix +- active bookmark now move when using prev/next (#37) +- fix some preservation of rename information on evolve (#33) +- abort when evolve tries to move a node on top of itself (will helps on the #35 front) +- fold: enable --date and --user options + 3.3.0 -- 2014-03-04 - add verbose hint about how to handle corner case by hand. diff --git a/hgext/evolve.py b/hgext/evolve.py --- a/hgext/evolve.py +++ b/hgext/evolve.py @@ -19,8 +19,7 @@ - improves some aspect of the early implementation in 2.3 ''' -testedwith = 'default' - +testedwith = '3.0' buglink = 'https://bitbucket.org/marmoute/mutable-history/issues' import sys diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -5,10 +5,10 @@ setup( name='hg-evolve', - version='3.3.0', + version='3.3.1', author='Pierre-Yves David', maintainer='Pierre-Yves David', - maintainer_email='pierre-yves.david@logilab.fr', + maintainer_email='pierre-yves.david@ens-lyon.org', url='https://bitbucket.org/marmoute/mutable-history', description='Flexible evolution of Mercurial history.', long_description=open('README').read(), diff --git a/tests/test-evolve.t b/tests/test-evolve.t diff --git a/tests/test-tutorial.t b/tests/test-tutorial.t