diff -Nru hgsubversion-1.8.5/debian/changelog hgsubversion-1.8.5/debian/changelog --- hgsubversion-1.8.5/debian/changelog 2016-03-10 05:32:51.000000000 +0000 +++ hgsubversion-1.8.5/debian/changelog 2016-04-07 10:55:08.000000000 +0000 @@ -1,3 +1,11 @@ +hgsubversion (1.8.5-1ubuntu1) xenial; urgency=medium + + * debian/patches/717bf096197ecbd5c35fac899883db2c35fd21fe.patch + fix testfailure about deprecated repo.parents()[0] call + (now repo[None].parents()[0]) + + -- Gianfranco Costamagna Thu, 07 Apr 2016 12:50:45 +0200 + hgsubversion (1.8.5-1) unstable; urgency=medium * New upstream release diff -Nru hgsubversion-1.8.5/debian/patches/717bf096197ecbd5c35fac899883db2c35fd21fe.patch hgsubversion-1.8.5/debian/patches/717bf096197ecbd5c35fac899883db2c35fd21fe.patch --- hgsubversion-1.8.5/debian/patches/717bf096197ecbd5c35fac899883db2c35fd21fe.patch 1970-01-01 00:00:00.000000000 +0000 +++ hgsubversion-1.8.5/debian/patches/717bf096197ecbd5c35fac899883db2c35fd21fe.patch 2016-04-07 10:54:40.000000000 +0000 @@ -0,0 +1,70 @@ +# User Shun-ichi GOTO +# Date 1456193799 -32400 +# Branch stable +# Node ID 717bf096197ecbd5c35fac899883db2c35fd21fe +# Parent 34968c4a6a02e4e43596a367a2dca77efee92076 +compat: fix some more use of repo.parents() + +fix repo.parents() to repo[None].parents() in some places +along with changeset 4f8b1f202c90. + +diff --git a/hgsubversion/util.py b/hgsubversion/util.py +--- a/hgsubversion/util.py ++++ b/hgsubversion/util.py +@@ -72,7 +72,7 @@ + def parentrev(ui, repo, meta, hashes): + """Find the svn parent revision of the repo's dirstate. + """ +- workingctx = repo.parents()[0] ++ workingctx = repo[None].parents()[0] + outrev = outgoing_revisions(repo, hashes, workingctx.node()) + if outrev: + workingctx = repo[outrev[-1]].parents()[0] +diff --git a/hgsubversion/wrappers.py b/hgsubversion/wrappers.py +--- a/hgsubversion/wrappers.py ++++ b/hgsubversion/wrappers.py +@@ -128,7 +128,7 @@ + # split off #rev; TODO implement --revision/#rev support + svn = other.svn + meta = repo.svnmeta(svn.uuid, svn.subdir) +- parent = repo.parents()[0].node() ++ parent = repo[None].parents()[0].node() + hashes = meta.revmap.hashes() + common, heads = util.outgoing_common_and_heads(repo, hashes, parent) + outobj = getattr(discovery, 'outgoing', None) +@@ -147,7 +147,7 @@ + # svnurl, revs, checkout = util.parseurl(dest.svnurl, heads) + svn = dest.svn + meta = repo.svnmeta(svn.uuid, svn.subdir) +- parent = repo.parents()[0].node() ++ parent = repo[None].parents()[0].node() + hashes = meta.revmap.hashes() + return util.outgoing_revisions(repo, hashes, parent) + +@@ -160,7 +160,7 @@ + meta = repo.svnmeta() + hashes = meta.revmap.hashes() + if not opts.get('rev', None): +- parent = repo.parents()[0] ++ parent = repo[None].parents()[0] + o_r = util.outgoing_revisions(repo, hashes, parent.node()) + if o_r: + parent = repo[o_r[-1]].parents()[0] +@@ -212,7 +212,7 @@ + + # Strategy: + # 1. Find all outgoing commits from this head +- if len(repo.parents()) != 1: ++ if len(repo[None].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[None].parents()[0] +@@ -557,7 +557,7 @@ + """ + extra['branch'] = ctx.branch() + extrafn = opts.get('svnextrafn', extrafn2) +- sourcerev = opts.get('svnsourcerev', repo.parents()[0].node()) ++ sourcerev = opts.get('svnsourcerev', repo[None].parents()[0].node()) + meta = repo.svnmeta() + hashes = meta.revmap.hashes() + o_r = util.outgoing_revisions(repo, hashes, sourcerev=sourcerev) diff -Nru hgsubversion-1.8.5/debian/patches/series hgsubversion-1.8.5/debian/patches/series --- hgsubversion-1.8.5/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ hgsubversion-1.8.5/debian/patches/series 2016-04-07 10:55:02.000000000 +0000 @@ -0,0 +1 @@ +717bf096197ecbd5c35fac899883db2c35fd21fe.patch