[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] Extending r15287 for issue #2264 - v2

From: VK Sameer <sameer_at_collab.net>
Date: 2005-09-24 05:44:53 CEST


Attached are updated patches, with and without style fixes. If the style
fixes for the first patch (2264-extended.diff) are acceptable, please
consider using that patch instead of 2264-extended-no-style.diff.

This version includes a test case: 'unlock_already_unlocked_files'.

Testing caveats: I ran 'make svncheck' and lock_tests.py succeeded. On
FC4, with gcc (4.0.1 20050727 (Red Hat 4.0.1-5), there was a memory
error about a multiple free (see attached message). I'd be grateful if
ra_svn experts could take a look at the code and see if I've freed
(svn_error_clear?) something twice.

There were errors related to Berkeley DB 4.3, which appear to be due to
compiling with the default options. I'll rebuild and reply to this email
if they fail.


Follow-up to commit r15287 which caused a regression - (un)locking
multiple files over ra_svn fails for benign (un)locking errors. Modified
the ra_svn protocol and implementation for (un)lock-many to return status
for each path on (un)lock. Minor style fixes for comments, declarations.

* subversion/libsvn_ra_svn/protocol: grammar change
  (lock-many): instead of returning a single response with multiple lock
  descriptions, return one lock description per path on success
  (unlock-many): instead of returning a single multi-path response,
  return each successfully unlocked pathname on success
* subversion/libsvn_ra_svn/client.c:
  (ra_svn_lock): accept multiple lock-many responses from server
  (ra_svn_unlock): accept multiple unlock-many responses from server
* subversion/svnserve/serve.c:
  (lock_many): Now returns multiple lock descriptions, one per path
  (unlock_many): Now returns multiple responses, one per path
* subversion/tests/clients/cmdline/lock_tests.py:
  (unlock_already_unlocked_files): New test
  (test_list): Added unlock_already_added_files

Running all tests in lock_tests.py...*** glibc detected *** /home/sameer/wc/svn/trunk/subversion/clients/cmdline/svn: double free or corruption (!prev): 0x0981b920 ***
======= Backtrace: =========
======= Memory map: ========
0025d000-00266000 r-xp 00000000 03:05 1730777 /lib/libnss_files-2.3.5.so
00266000-00267000 r-xp 00008000 03:05 1730777 /lib/libnss_files-2.3.5.so
00267000-00268000 rwxp 00009000 03:05 1730777 /lib/libnss_files-2.3.5.so
00499000-0049a000 r-xp 00499000 00:00 0
0079a000-008bd000 r-xp 00000000 03:05 1731066 /lib/libc-2.3.5.so
008bd000-008bf000 r-xp 00123000 03:05 1731066 /lib/libc-2.3.5.so
008bf000-008c1000 rwxp 00125000 03:05 1731066 /lib/libc-2.3.5.so
008c1000-008c3000 rwxp 008c1000 00:00 0
00b04000-00b05000 r-xp 00000000 03:05 1339183 /usr/lib/gconv/ISO8859-1.so
00b05000-00b07000 rwxp 00000000 03:05 1339183 /usr/lib/gconv/ISO8859-1.so
00f69000-00f83000 r-xp 00000000 03:05 1730403 /lib/ld-2.3.5.so
00f83000-00f84000 r-xp 00019000 03:05 1730403 /lib/ld-2.3.5.so
00f84000-00f85000 rwxp 0001a000 03:05 1730403 /lib/ld-2.3.5.so
08048000-0840d000 r-xp 00000000 03:05 1194997 /home/sameer/wc/svn/trunk/subversion/clients/cmdline/svn
0840d000-08425000 rw-p 003c5000 03:05 1194997 /home/sameer/wc/svn/trunk/subversion/clients/cmdline/svn
08425000-08454000 rw-p 08425000 00:00 0
097f2000-09835000 rw-p 097f2000 00:00 0 [heap]
b7b00000-b7b27000 rw-p b7b00000 00:00 0
b7b27000-b7c00000 ---p b7b27000 00:00 0
b7c2a000-b7d2a000 rw-p b7c2a000 00:00 0
b7d2a000-b7d30000 r--s 00000000 03:05 1339246 /usr/lib/gconv/gconv-modules.cache
b7d30000-b7d31000 r--p 00fe8000 03:05 868407 /usr/lib/locale/locale-archive
b7d31000-b7d63000 r--p 00fa0000 03:05 868407 /usr/lib/locale/locale-archive
b7d63000-b7f63000 r--p 00000000 03:05 868407 /usr/lib/locale/locale-archive
bfc4d000-bfc63000 rw-p bfc4d000 00:00 0 [stack]

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Sat Sep 24 05:46:09 2005

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.