# HG changeset patch # User Augie Fackler # Date 1453922840 18000 # Node ID 84789e32b32ec8f160e5cab35cce7266d204a10a # Parent 5ddb35c310975392bbd1a0fdce7e03b362c5dfbb# Parent 34968c4a6a02e4e43596a367a2dca77efee92076 Merge with stable. diff --git a/.hgtags b/.hgtags --- 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 diff --git a/hgsubversion/__init__.py b/hgsubversion/__init__.py --- 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 diff --git a/hgsubversion/wrappers.py b/hgsubversion/wrappers.py --- 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()