aboutsummaryrefslogtreecommitdiffstats
path: root/RepSys/svn.py
diff options
context:
space:
mode:
authorBogdano Arendartchuk <bogdano@mandriva.org>2007-01-02 15:23:10 +0000
committerBogdano Arendartchuk <bogdano@mandriva.org>2007-01-02 15:23:10 +0000
commit275cab2de13197085229b0478ecebb1859036092 (patch)
tree6f49be14b4dd154762e29a12ffa133b217df0017 /RepSys/svn.py
parent5c5b3e1f3304f55aa3467dae63d8cbdcdec59163 (diff)
downloadmgarepo-275cab2de13197085229b0478ecebb1859036092.tar
mgarepo-275cab2de13197085229b0478ecebb1859036092.tar.gz
mgarepo-275cab2de13197085229b0478ecebb1859036092.tar.bz2
mgarepo-275cab2de13197085229b0478ecebb1859036092.tar.xz
mgarepo-275cab2de13197085229b0478ecebb1859036092.zip
Make source lines fit in 80 columns
Diffstat (limited to 'RepSys/svn.py')
-rw-r--r--RepSys/svn.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/RepSys/svn.py b/RepSys/svn.py
index 1483a02..4e073dc 100644
--- a/RepSys/svn.py
+++ b/RepSys/svn.py
@@ -205,7 +205,8 @@ class SVN:
return [x.split() for x in output.split()]
return None
- def merge(self, url1, url2=None, rev1=None, rev2=None, path=None, **kwargs):
+ def merge(self, url1, url2=None, rev1=None, rev2=None, path=None,
+ **kwargs):
cmd = ["merge"]
if rev1 and rev2 and not url2:
cmd.append("-r")