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

--HG--
branch : trunk

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. """

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']