Mercurial > evolve
changeset 1235:ffa32ca659f1
merge with stable
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Wed, 01 Apr 2015 16:47:22 -0700 |
| parents | c15d4677f2ba (current diff) 5b6c42a3e12f (diff) |
| children | 10ad8e575315 |
| files | hgext/evolve.py |
| diffstat | 3 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Mar 30 13:31:09 2015 -0700 +++ b/.hgtags Wed Apr 01 16:47:22 2015 -0700 @@ -32,3 +32,4 @@ dbd0733e584073d6a7b6dea933767853e9cfe845 5.0.2 bfe9be352453640233371cc7deb409a09decacf9 5.1.0 9b8628e0a142e0e094e27430c388e3c12ceba513 5.1.1 +e886bc501796d53e0a19e608c6e5a6071191819e 5.1.2
--- a/README Mon Mar 30 13:31:09 2015 -0700 +++ b/README Wed Apr 01 16:47:22 2015 -0700 @@ -51,6 +51,10 @@ Changelog ========= +5.1.2 -- 2015-04-01 + +- evolve: prevent a crash in httpclient_pushobsmarkers() when pushing + 5.1.1 -- 2015-03-05 - debugobsconvert: fix invalid markers during conversion
--- a/hgext/evolve.py Mon Mar 30 13:31:09 2015 -0700 +++ b/hgext/evolve.py Wed Apr 01 16:47:22 2015 -0700 @@ -19,8 +19,8 @@ - improves some aspect of the early implementation in Mercurial core ''' -__version__ = '5.1.1' -testedwith = '3.3' +__version__ = '5.1.2' +testedwith = '3.3.3' buglink = 'http://bz.selenic.com/' import sys, os