changeset 1000:09b5e6a76724

Merge
author Augie Fackler <raf@durin42.com>
date Wed, 03 Apr 2013 15:15:31 -0500
parents 3f45bd7b60cf (diff) 8045ebda705a (current diff)
children 26aa0172725b
files
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgsubversion/wrappers.py
+++ b/hgsubversion/wrappers.py
@@ -118,7 +118,8 @@ def incoming(orig, ui, repo, origsource=
     return ret
 
 
-def findcommonoutgoing(repo, other, onlyheads=None, force=False, commoninc=None):
+def findcommonoutgoing(repo, other, onlyheads=None, force=False,
+                       commoninc=None, portable=False):
     assert other.capable('subversion')
     # split off #rev; TODO implement --revision/#rev support
     svn = other.svn