40515 14.11.2009 23:16:21, by
arfrever
On the 'python-3-compatibility' branch: Merge r40425:40514 from trunk. |
| 40514 14.11.2009 23:08:42, by
lgo
* tools/buildbot/master/master.cfg: Make the x64-centos buildbot also check
the bindings. |
| 40513 14.11.2009 22:53:54, by
arfrever
On the '1.6.x' branch:
* STATUS: Vote for some revisions. |
| 40512 14.11.2009 22:42:18, by
arfrever
* CHANGES
(1.6.5, 1.6.6):
* www/release-history.html
(1.6.6): Fix release dates. |
| 40511 14.11.2009 22:32:41, by
arfrever
Update Polish translation.
* subversion/po/pl.po: Update Polish translation. |
| 40510 14.11.2009 20:42:26, by
arfrever
Move inclusion of svn_debug.h from svn_types.h to svn_private_config.h.
* subversion/include/svn_types.h: Don't include "private/svn_debug.h".
* configure.ac: Include "private/svn_debug.h" in generated svn_private_config.h.in
file.
* subversion/svn_private_config.hw: Include "private/svn_debug.h".
Review by: gstein |
| 40509 14.11.2009 09:02:24, by
lgo
New configuration for the WanDisco CentOS buildslave.
* tools/buildbot/master/master.cfg: Add builder for x64-centos,
currently in test mode. |
| 40508 14.11.2009 02:43:35, by
julianfoad
On the fs-successor-ids branch: Bump the FS-BDB format number to 5, and make
the "successor ids" table conditional on format number at least 5.
* subversion/libsvn_fs_base/fs.c
(open_databases): Make opening the successor ids database conditional.
* subversion/libsvn_fs_base/fs.h
(SVN_FS_BASE__FORMAT_NUMBER): Bump from 4 to 5.
(SVN_FS_BASE__MIN_SUCCESSOR_IDS_FORMAT): New macro.
* subversion/libsvn_fs_base/node-rev.c
(svn_fs_base__create_successor, svn_fs_base__delete_node_revision): Make
the use of the successor ids table conditional.
(svn_fs_base__get_node_successors): Throw an "unsupported feature" error
if the format is less than 5.
* subversion/libsvn_fs_base/node-rev.h
(svn_fs_base__delete_node_revision): Fix a typo in the doc string. |
40507 13.11.2009 21:18:38, by
cmpilato
Sync up with the recent trunk changes. (Merged /trunk: r40393-40505) |
| 40506 13.11.2009 21:16:23, by
cmpilato
Expect the unexpected. (Unexpected for good reason.)
* subversion/tests/cmdline/authz_tests.py
(test_list): Now expect authz_access_required_at_repo_root() to
pass. It only does over ra_serf, but, hey, one can hope. |
| 40505 13.11.2009 20:56:02, by
cmpilato
Loosen up calculate_target_mergeinfo()'s restrictions, and fix its
callers.
* subversion/libsvn_client/copy.c
(calculate_target_mergeinfo): Drop the restriction about RA_SESSION's
parenting, and just reparent to the target for simplicity.
(wc_to_repos_copy, repos_to_wc_copy_single): Don't reparent the
session before calling calculate_target_mergeinfo(), and do pass
the right URL to calculate_target_mergeinfo(). |
| 40504 13.11.2009 20:36:17, by
pburba
Improve error message for invalid revision keywords from a URL merge source.
* subversion/libsvn_client/merge.c
(normalize_merge_sources): Error out early when invalid revision keywords
are specified with a URL merge source rather than proceeding and
eventually returning a decidedly cryptic error -- see
http://svn.haxx.se/dev/archive-2009-11/0603.shtml.
Patch by: Kannan R <kannanr{_AT_}collab.net>
Tweaked by: me |
| 40503 13.11.2009 19:24:30, by
stsp
Using the diff3 algorithm in the patch code was a bad idea.
Diff3 isn't designed for this. It works nicely if all hunks apply cleanly,
but not in the general case where hunks might not match at all.
So remove use of svn_wc_merge4() in favour of a simple svn_io_copy_file()
of the the patched result into the working copy.
* subversion/libsvn_client/patch.c
(patch_target_t): Remove ORIGINAL, ORIGINAL_RAW, and ORIGINAL_PATH members.
We don't need the "original" stream anymore.
(init_patch_target): Don't open the original stream anymore.
(copy_lines_to_target): Don't write to the original stream anymore.
(apply_one_hunk): Don't copy hunk text to the original stream anymore.
Adjust a comment.
(apply_one_patch): Stop using svn_wc_merge4() to apply modifications to
the patch target. Just copy the patched temporary file on top of the target
instead. Adjust some comments. |
| 40502 13.11.2009 18:44:22, by
arfrever
* build/generator/ezt.py: Support Python 3.
ezt upstream issue: http://code.google.com/p/ezt/issues/detail?id=5 |
40501 13.11.2009 18:42:31, by
stsp
* subversion/libsvn_client/patch.c (resolve_target_path): Remove the hack added in r40399 which was supposed to help with applying patches containing paths with Windows-style path separators on UNIX. The rationale is that UNIX patch does not do this, so we shouldn't either. This commit does not revert r40399 entirely, since we keep using svn_dirent_internal_style() rather than svn_dirent_canonicalize() to canonicalize the target path parsed from the patch file. Suggested by: brane |
| 40500 13.11.2009 18:38:43, by
julianfoad
* tools/buildbot/slaves/centos
A new buildbot slave configuration.
* centos/svnbuild.sh
* centos/svncheck-bindings.sh
* centos/svncheck.sh
* centos/svnclean.sh
* centos/svnlog.sh
New scripts, modeled on the ubuntu ones. |
| 40499 13.11.2009 16:38:31, by
arfrever
On the 'python-3-compatibility' branch:
* build/run_tests.py
(TestHarness.run): 'wimptag' should be str instead of bytes. |
40498 13.11.2009 16:32:42, by
arfrever
Follow-up to r40492: * subversion/svn/cl.h (svn_cl__path_join): Fix typo in doc string. |
40497 13.11.2009 15:56:32, by
pburba
Follow-up to r40493, fix a compiler warning. * subversion/libsvn_ra_neon/lock.c (do_lock): Remove unused format arg when creating an error. |
40496 13.11.2009 15:36:32, by
philip
* Makefile.in: Remove misc-docs support as r40489 removed doc/misc-docs/. |
|
|