floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix compatibility issue with svnwc.update and put CHANGELOG to rootlevel 

--HG--
branch : trunk
This commit is contained in:
holger krekel 2009-11-20 00:12:06 +01:00
parent 6d9e3ac686
commit 452ce50d7d
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
py/impl/path/svnwc.py
View File

@ -521,9 +521,12 @@ class SvnWCCommandPath(common.PathBase):
args.append(url) args.append(url)
self._authsvn('co', args) 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). """ """ 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'): def write(self, content, mode='w'):
""" write content into local filesystem wc. """ """ write content into local filesystem wc. """

2
testing/path/test_svnwc.py
View File

@ -176,7 +176,7 @@ class TestWCSvnCommandPath(CommonSvnTests):
p.write('bar') p.write('bar')
wc.commit('wrote some data') wc.commit('wrote some data')
wccopy.join('conflictsamplefile').write('baz') wccopy.join('conflictsamplefile').write('baz')
wccopy.update() wccopy.update(interactive=False)
s = wccopy.status() s = wccopy.status()
assert [x.basename for x in s.conflict] == ['conflictsamplefile'] assert [x.basename for x in s.conflict] == ['conflictsamplefile']