From 452ce50d7d23c22c88360fe34e90649af2f2c93e Mon Sep 17 00:00:00 2001 From: holger krekel Date: Fri, 20 Nov 2009 00:12:06 +0100 Subject: [PATCH] fix compatibility issue with svnwc.update and put CHANGELOG to rootlevel --HG-- branch : trunk --- py/impl/path/svnwc.py | 7 +++++-- testing/path/test_svnwc.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/py/impl/path/svnwc.py b/py/impl/path/svnwc.py index 4929bb828..be88d59da 100644 --- a/py/impl/path/svnwc.py +++ b/py/impl/path/svnwc.py @@ -521,9 +521,12 @@ class SvnWCCommandPath(common.PathBase): args.append(url) self._authsvn('co', args) - def update(self, rev='HEAD'): + def update(self, rev='HEAD', interactive=True): """ update working copy item to given revision. (None -> HEAD). """ - self._authsvn('up', ['-r', rev, "--non-interactive"],) + opts = ['-r', rev] + if not interactive: + opts.append("--non-interactive") + self._authsvn('up', opts) def write(self, content, mode='w'): """ write content into local filesystem wc. """ diff --git a/testing/path/test_svnwc.py b/testing/path/test_svnwc.py index c9679cfad..6fe68bb5e 100644 --- a/testing/path/test_svnwc.py +++ b/testing/path/test_svnwc.py @@ -176,7 +176,7 @@ class TestWCSvnCommandPath(CommonSvnTests): p.write('bar') wc.commit('wrote some data') wccopy.join('conflictsamplefile').write('baz') - wccopy.update() + wccopy.update(interactive=False) s = wccopy.status() assert [x.basename for x in s.conflict] == ['conflictsamplefile']