Mercurial > hgsubversion

changeset 1372:84789e32b32e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable.
author Augie Fackler <raf@durin42.com>
date Wed, 27 Jan 2016 14:27:20 -0500
parents 5ddb35c31097 (current diff) 34968c4a6a02 (diff)
children b072dc02d1e3
files hgsubversion/wrappers.py
diffstat 3 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags
+++ b/.hgtags
@@ -19,3 +19,4 @@ dde1ade36a49d3d0e1b4b8bd384a6797665b5081
 38be7a6b6def3298fe9ffff141eb58e1370a53cc 1.8.2
 759cafce6becef077fb1a152b554a05ff66b04cd 1.8.3
 89997a5fc18163c5f65b83272b4521cdbf29984e 1.8.4
+bd979667611d9df733c61251e7668899f3e77a8f 1.8.5
--- a/hgsubversion/__init__.py
+++ b/hgsubversion/__init__.py
@@ -15,7 +15,7 @@ details.
 For more information and instructions, see :hg:`help subversion`.
 '''
 
-testedwith = '2.8.2 3.0.1 3.1 3.2.2 3.3'
+testedwith = '2.8.2 3.0.1 3.1 3.2.2 3.3 3.4 3.5 3.6 3.7'
 
 import os
 import sys
--- a/hgsubversion/wrappers.py
+++ b/hgsubversion/wrappers.py
@@ -216,7 +216,7 @@ def push(repo, dest, force, revs):
         if len(repo.parents()) != 1:
             ui.status('Cowardly refusing to push branch merge\n')
             return 0 # results in nonzero exit status, see hg's commands.py
-        workingrev = repo.parents()[0]
+        workingrev = repo[None].parents()[0]
         workingbranch = workingrev.branch()
         ui.status('searching for changes\n')
         hashes = meta.revmap.hashes()