Skip to content
Browse files

bug 731989, update to mercurial 2.1.2, and just that, r=peterbe

  • Loading branch information...
1 parent 0fdceb1 commit ec2fff354b6c8fc60d77f56f866faf3c001f2d2a @Pike committed Mar 1, 2012
Showing with 7 additions and 7 deletions.
  1. +1 −1 requirements.txt
  2. +4 −4 scripts/create-test-env.py
  3. +1 −1 vendor-local/elmo
  4. +1 −1 vendor-local/locale-inspector
View
2 requirements.txt
@@ -1,4 +1,4 @@
-mercurial==1.5.4
+mercurial==2.1.2
Twisted==8.2.0
simplejson
MySQL-python
View
8 scripts/create-test-env.py
@@ -17,8 +17,8 @@ def ensureCustomRepository(reponame, revision, hgcustom_orig, env_path):
if rv:
raise RuntimeError("hg failed to pull hgcustom's %s" % reponame)
else:
- rv = subprocess.call(['hg', '--config', 'format.dotencode=0', 'clone',
- '--noupdate','--pull', '%s/%s' % (hgcustom_orig, reponame)],
+ rv = subprocess.call(['hg', 'clone', '--noupdate','--pull',
+ '%s/%s' % (hgcustom_orig, reponame)],
cwd = base)
if rv:
raise RuntimeError('hg failed to clone %s' % reponame)
@@ -122,8 +122,8 @@ def createEnvironment(env_path, hgcustom_orig):
if rv:
raise RuntimeError("Failed to create virtualenv in " + env_path)
hgcustom = {
- 'hg_templates': 'aebc5445f05f',
- 'hghooks': 'ebea31cf1cc0',
+ 'hg_templates': '672340227bea',
+ 'hghooks': '1e7a365890ab',
'pushlog': 'e99a36d3fd4a'
}
if not (hgcustom_orig.startswith('http://') or
2 vendor-local/elmo
@@ -1 +1 @@
-Subproject commit 44fed88001ee949f3955876436aa0a58841e6412
+Subproject commit 477a4f161269bd29b2aef32bc44f5f8ccddb0115
2 vendor-local/locale-inspector
@@ -1 +1 @@
-Subproject commit 4bb56c7a379552340c1886be8a705ae3bb294b66
+Subproject commit 9499e524b5018c03aa6acb75dc78d2d984dd1fdc

0 comments on commit ec2fff3

Please sign in to comment.
Something went wrong with that request. Please try again.