- r32774: 2008-08-27 21:57:49 [julianfoad] Julian Foad
-
[tree-conflicts] /subversion/include/svn_wc.h [diff, log, file]
* subversion/include/svn_wc.h
(svn_wc_conflicted_p2): Make the doc string reflect the implementation.
This mostly means making it like the doc string for svn_wc_conflicted_p()
on trunk and removing "###" comments and questions.
- r32773: 2008-08-27 21:12:47 [rhuijben] User: rhuijben
-
/subversion/libsvn_subr/simple_providers.c [diff, log, file]
* subversion/libsvn_subr/simple_providers.c
(svn_auth__simple_save_creds_helper): Minor documentation cleanup.
Found by: stylesen
- r32772: 2008-08-27 21:09:32 [arfrever] User: arfrever
-
Click to show all 21 changes...
Mark deprecated functions with SVN_DEPRECATED.
* subversion/include/svn_types.h
(SVN_DEPRECATED): Define.
* subversion/include/svn_auth.h:
* subversion/include/svn_base64.h:
* subversion/include/svn_client.h:
* subversion/include/svn_cmdline.h:
* subversion/include/svn_config.h:
* subversion/include/svn_delta.h:
* subversion/include/svn_diff.h:
* subversion/include/svn_dso.h:
* subversion/include/svn_error.h:
* subversion/include/svn_fs.h:
* subversion/include/svn_hash.h:
* subversion/include/svn_io.h:
* subversion/include/svn_opt.h:
* subversion/include/svn_ra.h:
* subversion/include/svn_ra_svn.h:
* subversion/include/svn_repos.h:
* subversion/include/svn_subst.h:
* subversion/include/svn_utf.h:
* subversion/include/svn_wc.h: Mark deprecated functions with SVN_DEPRECATED.
* www/hacking.html
(deprecation): Update example.
Review by: blair
julianfoad
- r32771: 2008-08-27 21:00:00 [arfrever] User: arfrever
-
/tools/po/po-update.sh [diff, log, file]
Follow-up to r25332 and r25439:
* tools/po/po-update.sh: Search for messages in svn_fs_util.h. Previously
messages defined in svn_fs_util.h weren't added to .po files by xgettext.
- r32770: 2008-08-27 20:45:45 [arfrever] User: arfrever
-
/subversion/po/pl.po [diff, log, file]
Polish translation update.
* subversion/po/pl.po: Polish translation update.
- r32769: 2008-08-27 20:43:22 [danielsh] User: danielsh
-
/subversion/libsvn_client/export.c [diff, log, file]
Follow-up to r32638:
* subversion/libsvn_client/export.c
(svn_client_export4):
Enforce that PEG_REVISION and REVISION are not NULL.
- r32768: 2008-08-27 20:40:55 [hwright] Hyrum Wright
-
/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java [diff, log, file]
* subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
Fix a number of JavaDoc warnings.
- r32767: 2008-08-27 18:52:14 [arfrever] User: arfrever
-
[1.5.x] /subversion/po/pl.po [diff, log, file]
On the '1.5.x' branch:
Polish translation update.
* subversion/po/pl.po: Backport some changes from trunk.
- r32766: 2008-08-27 17:54:46 [hwright] Hyrum Wright
-
/subversion/include/svn_mergeinfo.h [diff, log, file]
* subversion/include/svn_mergeinfo.h
(svn_rangelist_remove): Small doxygen fix.
- r32765: 2008-08-27 16:38:38 [rhuijben] User: rhuijben
-
/subversion/include/private/svn_auth_private.h [diff, log, file]
/subversion/libsvn_subr/simple_providers.c [diff, log, file]
/subversion/libsvn_subr/win32_crypto.c [diff, log, file]
Following up to r32752 add svn_auth__simple_password_get and
svn_auth__simple_password_set to the private auth api to fix the windows
crypto code.
* subversion/include/private/svn_auth_private.h
(svn_auth__simple_password_get): Added simple password getter used by the
windows crypto provider.
(svn_auth__simple_password_set): Added simple password getter used by the
windows crypto provider.
* subversion/libsvn_subr/simple_providers.c
(svn_auth__simple_password_get): Renamed from simple_password_get and remove
static.
(svn_auth__simple_password_set): Renamed from simple_password_get and remove
static.
(simple_first_creds): Update reference to svn_auth__simple_password_get.
(simple_save_creds): Update reference to svn_auth__simple_password_set.
* subversion/libsvn_subr/win32_crypto.c
(windows_password_encrypter): Update reference to
svn_auth__simple_password_get.
(windows_password_decrypter): Update reference to
svn_auth__simple_password_set.
- r32764: 2008-08-27 16:20:50 [hwright] Hyrum Wright
-
[1.5.x] /CHANGES [diff, log, file]
* CHANGES: Merge the 1.5.2 section from trunk.
- r32763: 2008-08-27 16:19:47 [hwright] Hyrum Wright
-
/CHANGES [diff, log, file]
* CHANGES:
(1.5.2): Date the release.
- r32762: 2008-08-27 16:13:52 [hwright] Hyrum Wright
-
/CHANGES [diff, log, file]
* CHANGES:
(1.5.2): Bring up-to-date with merges to 1.5.x.
- r32761: 2008-08-27 16:09:18 [hwright] Hyrum Wright
-
[1.5.x] / [diff, log, file]
[1.5.x] /CHANGES [diff, log, file]
[1.5.x] /COMMITTERS [diff, log, file]
[1.5.x] /STATUS [diff, log, file]
[1.5.x] /subversion/bindings/swig [diff, log, file]
[1.5.x] /subversion/libsvn_client/merge.c [diff, log, file]
[1.5.x] /subversion/tests/cmdline/merge_tests.py [diff, log, file]
Merge the following from trunk:
* r32706, r32707, r32730
Fix another issue #3067 bug where subtree mergeinfo can occur that
breaks the merge editor drive.
Notes:
r32706 is a new test, r32707 is the fix. r32730 is an obvious
fix (comment formatting tweak).
Justification:
We've already encountered this problem in our own repository when
trying to synch up the fs-rep-sharing branch with trunk (sorry no
thread to reference, only discussed in IRC but the new test in r32706
shows how it can happen).
Votes:
+1: pburba, cmpilato, julianfoad
- r32760: 2008-08-27 16:07:21 [julianfoad] Julian Foad
-
[1.5.x] /STATUS [diff, log, file]
* STATUS: Vote for r32706 group, approving it.
- r32759: 2008-08-27 15:44:25 [jwhitlock] User: jwhitlock
-
/CHANGES [diff, log, file]
* CHANGES: Spelling correction and minor rewording in 1.5.2 section.
Approved by: hwright
- r32758: 2008-08-27 15:31:53 [hwright] Hyrum Wright
-
[1.5.x] / [diff, log, file]
[1.5.x] /CHANGES [diff, log, file]
[1.5.x] /COMMITTERS [diff, log, file]
[1.5.x] /STATUS [diff, log, file]
[1.5.x] /subversion/bindings/swig [diff, log, file]
[1.5.x] /subversion/libsvn_wc/props.c [diff, log, file]
[1.5.x] /subversion/tests/cmdline/externals_tests.py [diff, log, file]
Merge the following from trunk:
* r32672, r32673, r32674, r32739
Fix an inconsistency in parsing svn:externals with the new 1.5
relative URL support when both a relative URL and a relative path
is used with -r N. Also, add stricter checking on svn:externals.
Justification:
If an 1.4 style external with -r N and an absolute URL is changed
to use a relative URL, then svn will not parse the URL as a URL
any more but as the target directory, which is odd and
inconsistent behavior. The code without this fix does not match
the documentation on the web site.
Votes:
+1: blair, cmpilato, hwright
- r32757: 2008-08-27 15:28:15 [hwright] Hyrum Wright
-
[1.5.x] /STATUS [diff, log, file]
* STATUS: Vote for the r32672 group, approving.
- r32756: 2008-08-27 15:14:20 [rhuijben] User: rhuijben
-
/subversion/libsvn_subr/macos_keychain.c [diff, log, file]
* subversion/libsvn_subr/macos_keychain.c
Following up to 32752 move #if SVN_HAVE_KEYCHAIN_SERVICES after the
subversion includes. (Fixes compiling on OSX)
- r32755: 2008-08-27 15:05:03 [hwright] Hyrum Wright
-
/CHANGES [diff, log, file]
* CHANGES:
(1.5.2): Bring up-to-date with merges to 1.5.x.
- r32754: 2008-08-27 14:56:55 [pburba] Paul T. Burba
-
/subversion/libsvn_client/merge.c [diff, log, file]
* subversion/libsvn_client/merge.c
(mergeinfo_behavior): Doc string polish.
- r32753: 2008-08-27 14:49:12 [hwright] Hyrum Wright
-
/www/hacking.html [diff, log, file]
* www/hacking.html
(patches): Add some markup around the suggested mime-types for patch
submission.
- r32752: 2008-08-27 14:42:18 [rhuijben] User: rhuijben
-
/subversion/libsvn_subr/macos_keychain.c [log, file]
/subversion/libsvn_subr/simple_providers.c [diff, log, file]
/subversion/libsvn_subr/win32_crypto.c [log, file]
Move Windows crypto and Mac OS keychain support from simple_providers.c to
provider specific files as preparation for new issue #2489 implementations.
* subversion/libsvn_subr/simple_providers.c
(svn_auth__simple_first_creds_helper, svn_auth__simple_save_creds_helper):
Update documentation to reflect that it is used most simple credential
implementations.
(get_crypto_function, windows_password_encrypter,
windows_password_decrypter, windows_simple_first_creds,
windows_simple_save_creds, windows_simple_provider,
svn_auth_get_windows_simple_provider):
Move to win32_crypto.c.
(keychain_password_set, keychain_password_get,
keychain_simple_first_creds, keychain_simple_first_creds,
keychain_simple_provider, keychain_simple_save_creds,
svn_auth_get_keychain_simple_provider):
Move to macos_keychain.c.
* subversion/libsvn_subr/macos_keychain.c
(keychain_password_set, keychain_password_get,
keychain_simple_first_creds, keychain_simple_first_creds,
keychain_simple_provider, keychain_simple_save_creds,
svn_auth_get_keychain_simple_provider):
Move here from simple_providers.c.
* subversion/libsvn_subr/win32_crypto.c
(get_crypto_function, windows_password_encrypter,
windows_password_decrypter, windows_simple_first_creds,
windows_simple_save_creds, windows_simple_provider,
svn_auth_get_windows_simple_provider):
Move here from simple_providers.c.
- r32751: 2008-08-27 11:23:56 [pburba] Paul T. Burba
-
[1.5.x] / [diff, log, file]
[1.5.x] /CHANGES [diff, log, file]
[1.5.x] /COMMITTERS [diff, log, file]
[1.5.x] /STATUS [diff, log, file]
[1.5.x] /subversion/bindings/swig [diff, log, file]
[1.5.x] /subversion/libsvn_ra_neon/session.c [diff, log, file]
Merge r31867 and r32365 from trunk to the 1.5.x branch.
* r31867, r32365
In the "Malformed URL for repository" error message, show the URL.
Justification:
Trivial change that may shed light on a bug that we can't reproduce
that's been hitting several people - see the email thread
<http://svn.haxx.se/dev/archive-2008-06/0939.shtml>.
Votes:
+1: julianfoad, rhuijben, pburba
- r32750: 2008-08-27 11:21:14 [pburba] Paul T. Burba
-
[1.5.x] / [diff, log, file]
[1.5.x] /CHANGES [diff, log, file]
[1.5.x] /COMMITTERS [diff, log, file]
[1.5.x] /subversion/bindings/swig [diff, log, file]
Follow-up to r32749: Use a --record-only merge to set mergeinfo for merge
of r32643 from trunk. I accidentally deselected the mergeinfo changes when
committing.