Skip to content
Snippets Groups Projects
Commit eea339cf authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

branching: merge with stable

parents d3ea35ad c4b891fe
No related branches found
No related tags found
No related merge requests found
......@@ -24,6 +24,7 @@
import hashlib
import heapq
import inspect
import sqlite3
import struct
import weakref
......@@ -110,7 +111,13 @@
if len(undecided) < fullsamplesize:
sample = set(undecided)
else:
sample = _takefullsample(dag, undecided, size=fullsamplesize)
# Mercurial 4.8 changed calling convention.
if len(inspect.getargspec(_takefullsample)[0]) == 4:
sample = _takefullsample(local, None, undecided,
size=fullsamplesize)
else:
# hg <= 4.7 version
sample = _takefullsample(dag, undecided, size=fullsamplesize)
roundtrips += 1
ui.progress(_("comparing with other"), totalnb - len(undecided),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment