Patchwork [6,of,6,evolve-ext,for-the-record] merge with stable

login
register
mail settings
Submitter Pierre-Yves David
Date April 1, 2015, 11:50 p.m.
Message ID <ffa32ca659f1eb26e0f6.1427932213@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/8436/
State Accepted
Commit 37a2b446985f2ef77b9690a0548c8630828b7412
Headers show

Comments

Pierre-Yves David - April 1, 2015, 11:50 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1427932042 25200
#      Wed Apr 01 16:47:22 2015 -0700
# Node ID ffa32ca659f1eb26e0f67e68f698837766819c3f
# Parent  c15d4677f2ba946c62387fe1ec27d383aa3274a9
# Parent  5b6c42a3e12fc98e7b278eaee8923ecef5049dca
merge with stable

Patch

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -30,5 +30,6 @@  51e1e962172c0178394cd36652d90181319f5416
 51e1e962172c0178394cd36652d90181319f5416 5.0.1
 0f30907852831f818bd0d01141b4ab7d8d71b821 5.0.1
 dbd0733e584073d6a7b6dea933767853e9cfe845 5.0.2
 bfe9be352453640233371cc7deb409a09decacf9 5.1.0
 9b8628e0a142e0e094e27430c388e3c12ceba513 5.1.1
+e886bc501796d53e0a19e608c6e5a6071191819e 5.1.2
diff --git a/README b/README
--- a/README
+++ b/README
@@ -49,10 +49,14 @@  add a feature. To run the tests:
 
 
 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
 - discovery: cache some of the obs hash computation to improve performance (issue4518)
 - revset: fix some crash with (issue4515)
diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -17,12 +17,12 @@  It also:
     - alters core commands and extensions that rewrite history to use
       this feature,
     - 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
 import random
 from StringIO import StringIO