Mercurial > evolve
changeset 919:ffce88754767
merge with stable
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Wed, 23 Apr 2014 14:28:28 -0700 |
| parents | ff71b83a4bbe (current diff) 6c5a6c2706f6 (diff) |
| children | dbeb1e649c5a |
| files | README hgext/evolve.py tests/test-evolve.t tests/test-tutorial.t |
| diffstat | 4 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Apr 14 15:10:29 2014 -0400 +++ b/.hgtags Wed Apr 23 14:28:28 2014 -0700 @@ -20,3 +20,4 @@ cdb52bbbe5b8770d5e68943b7e73bee4ba136ecc 3.1.0 c3ba8a965a7a173e388d84819e936ea9bae9797f 3.2.0 83882f2fbecba0b7e7f7e5d490b57db93bd7fa22 3.3.0 +fc04758ea9f549684989ee673b04d9724756dc85 3.3.1
--- a/README Mon Apr 14 15:10:29 2014 -0400 +++ b/README Wed Apr 23 14:28:28 2014 -0700 @@ -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.
--- a/hgext/evolve.py Mon Apr 14 15:10:29 2014 -0400 +++ b/hgext/evolve.py Wed Apr 23 14:28:28 2014 -0700 @@ -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
--- a/setup.py Mon Apr 14 15:10:29 2014 -0400 +++ b/setup.py Wed Apr 23 14:28:28 2014 -0700 @@ -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(),