Author: stsp
Date: Thu Jan 29 21:52:36 2015
New Revision: 1655872
URL: http://svn.apache.org/r1655872
Log:
On the pin-externals branch, make WC->WC copies offline operations notI
contact the reposiory even if --pin-externals is active.
Suggested by: brane
rhuijben
* subvers
Author: stsp
Date: Thu Jan 29 21:58:20 2015
New Revision: 1655874
URL: http://svn.apache.org/r1655874
Log:
On the pin-externals branch, merge outstanding changes from trunk.
Modified:
subversion/branches/pin-externals/ (props changed)
subversion/branches/pin-externals/subversion
Author: stsp
Revision: 1655872
Modified property: svn:log
Modified: svn:log at Thu Jan 29 21:59:09 2015
--
--- svn:log (original)
+++ svn:log Thu Jan 29 21:59:09 2015
@@ -1,5 +1,5 @@
On the pin-externals branch, make WC
Author: stsp
Date: Thu Jan 29 22:07:33 2015
New Revision: 1655875
URL: http://svn.apache.org/r1655875
Log:
On the pin-externals branch, don't close an editor dir baton too early.
Found by: rhuijben
* subversion/libsvn_client/copy.c
(path_driver_cb_func): If we open a directory here to
Author: stsp
Date: Fri Jan 30 00:13:51 2015
New Revision: 1655892
URL: http://svn.apache.org/r1655892
Log:
On the pin-externals branch, fix 'svn help copy' documentation.
* subversion/svn/svn.c
(svn_cl__options): We don't pin externals to their last-changed
revision an
Author: stsp
Date: Tue Feb 3 15:57:22 2015
New Revision: 1656769
URL: http://svn.apache.org/r1656769
Log:
On the pin-externals branch, support the legacy svn:externals syntax.
This avoids confusing old clients in cases where the legacy syntax is
used on purpose and 'svn copy --pin-external
Author: stsp
Date: Tue Feb 3 17:50:43 2015
New Revision: 1656845
URL: http://svn.apache.org/r1656845
Log:
On the pin-externals branch, preserve the strings used to specify peg and
operative revisions of already pinned externals.
This keeps revisions such as "-r{2015-02-04}" intact
Modified:
subversion/branches/pin-externals/subversion/libsvn_subr/ssl_server_trust_providers.c
URL:
http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/libsvn_subr/ssl_server_trust_providers.c?rev=1656942&r1=1656941&r2=1656942&view=diff
=
Author: stsp
Date: Tue Feb 3 22:51:18 2015
New Revision: 1656942
URL: http://svn.apache.org/r1656942
Log:
On the pin-externals branch, merge outstanding changes from trunk.
Added:
subversion/branches/pin-externals/subversion/include/svn_x509.h
- copied unchanged from r1656940
Author: stsp
Date: Tue Feb 3 22:59:13 2015
New Revision: 1656946
URL: http://svn.apache.org/r1656946
Log:
Ignore x509-related binaries.
* subversion/tests/libsvn_subr: Ignore x509-test.
* tools/dev: Ignore x509-parser.
Modified:
subversion/trunk/subversion/tests/libsvn_subr/ (props
Author: stsp
Date: Wed Feb 4 11:34:12 2015
New Revision: 1657124
URL: http://svn.apache.org/r1657124
Log:
On the pin-externals branch, merge oustanding changes from trunk.
Modified:
subversion/branches/pin-externals/ (props changed)
subversion/branches/pin-externals/subversion
Author: stsp
Date: Wed Feb 4 14:58:59 2015
New Revision: 1657267
URL: http://svn.apache.org/r1657267
Log:
On the pin-externals branch, allow fine-grained API-level control over which
externals get pinned during a copy. This feature is intended for clients which
allow users to select specific
Author: stsp
Date: Wed Feb 4 15:06:04 2015
New Revision: 1657271
URL: http://svn.apache.org/r1657271
Log:
On the pin-externals branch, add two todo comments.
* subversion/libsvn_client/copy.c
(do_wc_to_wc_copies_with_write_lock, repos_to_wc_copy_single): Perhaps we
should be using a work
Author: stsp
Date: Wed Feb 4 15:16:32 2015
New Revision: 1657277
URL: http://svn.apache.org/r1657277
Log:
On the pin-externals branch, fix a typo.
* subversion/tests/libsvn_client/client-test.c
(test_copy_pin_externals): Fix typo in comment.
Modified:
subversion/branches/pin-externals
Author: stsp
Date: Wed Feb 4 16:03:23 2015
New Revision: 1657297
URL: http://svn.apache.org/r1657297
Log:
On the pin-externals branch, error out if users attempt to pin checked out
externals which have local modifications, switched subtrees, or mixed revisions.
Suggested by: julianfoad
Author: stsp
Date: Tue Feb 10 11:27:10 2015
New Revision: 1658680
URL: http://svn.apache.org/r1658680
Log:
On the pin-externals branch, split the test up into several test functions.
This allows for running tests individually and also reduces the amount of
modified repository state the tests
Modified:
subversion/branches/pin-externals/subversion/tests/cmdline/svnrdump_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/svnrdump_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
===
Modified:
subversion/branches/pin-externals/subversion/tests/cmdline/tree_conflict_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/tree_conflict_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
=
Author: stsp
Date: Tue Feb 10 11:41:57 2015
New Revision: 1658686
URL: http://svn.apache.org/r1658686
Log:
On the pin-externals branch, merge outstanding changes from trunk.
Added:
subversion/branches/pin-externals/TODO
- copied unchanged from r1658683, subversion/trunk/TODO
Modified:
subversion/branches/pin-externals/subversion/tests/cmdline/basic_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/basic_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
=
Modified:
subversion/branches/pin-externals/subversion/tests/cmdline/commit_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/commit_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
===
Modified:
subversion/branches/pin-externals/subversion/tests/libsvn_fs/locks-test.c
URL:
http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/libsvn_fs/locks-test.c?rev=1658686&r1=1658685&r2=1658686&view=diff
=
Modified:
subversion/branches/pin-externals/subversion/tests/cmdline/copy_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/copy_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
===
Modified:
subversion/branches/pin-externals/subversion/tests/cmdline/merge_tree_conflict_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/merge_tree_conflict_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
=
Modified:
subversion/branches/pin-externals/subversion/tests/cmdline/merge_authz_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/merge_authz_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
=
Modified:
subversion/branches/pin-externals/subversion/tests/cmdline/diff_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/diff_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
===
Modified:
subversion/branches/pin-externals/subversion/tests/cmdline/merge_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/merge_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
=
Modified:
subversion/branches/pin-externals/subversion/tests/cmdline/lock_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/lock_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
===
Modified:
subversion/branches/pin-externals/subversion/tests/cmdline/schedule_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/schedule_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
===
Modified:
subversion/branches/pin-externals/subversion/tests/cmdline/externals_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/externals_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
=
Modified:
subversion/branches/pin-externals/subversion/tests/cmdline/prop_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/prop_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
===
Modified:
subversion/branches/pin-externals/subversion/tests/cmdline/depth_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/depth_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
=
Modified:
subversion/branches/pin-externals/subversion/libsvn_wc/wc_db_update_move.c
URL:
http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/libsvn_wc/wc_db_update_move.c?rev=1658686&r1=1658685&r2=1658686&view=diff
===
Modified:
subversion/branches/pin-externals/subversion/tests/cmdline/svnadmin_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/svnadmin_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
===
Modified: subversion/branches/pin-externals/subversion/libsvn_wc/conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/libsvn_wc/conflicts.c?rev=1658686&r1=1658685&r2=1658686&view=diff
Author: stsp
Date: Tue Feb 10 11:43:19 2015
New Revision: 1658688
URL: http://svn.apache.org/r1658688
Log:
On the pin-externals branch, remove a done TODO item from BRANCH-README.
Modified:
subversion/branches/pin-externals/BRANCH-README
Modified: subversion/branches/pin-externals/BRANCH
Author: stsp
Date: Tue Feb 10 15:47:21 2015
New Revision: 1658736
URL: http://svn.apache.org/r1658736
Log:
On the pin-externals branch, repair test breakage introduced by the most
recent merge with trunk which brought in the changes from r1658410.
* subversion/tests/cmdline/externals_tests.py
Modified: subversion/branches/pin-externals/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/libsvn_wc/wc_db.c?rev=1659301&r1=1659300&r2=1659301&view=diff
==
--- s
Modified: subversion/branches/pin-externals/subversion/tests/libsvn_ra/ra-test.c
URL:
http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/libsvn_ra/ra-test.c?rev=1659301&r1=1659300&r2=1659301&view=diff
Author: stsp
Date: Thu Feb 12 16:14:28 2015
New Revision: 1659301
URL: http://svn.apache.org/r1659301
Log:
On the pin-externals branch, merge outstanding changes from trunk.
Added:
subversion/branches/pin-externals/subversion/svnbench/
- copied from r1659295, subversion/trunk
Author: stsp
Date: Thu Feb 12 16:44:45 2015
New Revision: 1659311
URL: http://svn.apache.org/r1659311
Log:
On the pin-externals branch, improve API documentation.
* subversion/include/svn_client.h
(svn_client_copy7): Explain what "pinning" an external means and
explain the
Author: stsp
Date: Thu Feb 12 17:06:26 2015
New Revision: 1659319
URL: http://svn.apache.org/r1659319
Log:
On the pin-externals branch, add some docstrings.
* subversion/libsvn_client/copy.c
(make_external_description, resolve_pinned_externals,
queue_externals_change_path_infos): Add
Author: stsp
Date: Thu Feb 12 17:11:18 2015
New Revision: 1659324
URL: http://svn.apache.org/r1659324
Log:
On the pin-externals branch, deprecate the svncopy.pl script.
* contrib/client-side/svncopy/svncopy.pl.in: Document the fact that this
script is deprecated and explain what the
Author: stsp
Date: Thu Feb 12 18:06:47 2015
New Revision: 1659344
URL: http://svn.apache.org/r1659344
Log:
On the pin-externals branch, extend a regression test.
* subversion/tests/libsvn_client/client-test.c
(test_copy_pin_externals): Check the unparsed form of pinned externals
definitions
Author: stsp
Date: Thu Feb 12 18:32:50 2015
New Revision: 1659352
URL: http://svn.apache.org/r1659352
Log:
On the pin-externals branch, check that {DATE} revisions retain
their exact string representation during the pinning process.
* subversion/tests/libsvn_client/client-test.c
Author: stsp
Date: Thu Feb 12 18:41:56 2015
New Revision: 1659356
URL: http://svn.apache.org/r1659356
Log:
Follow-up to r1659352:
On the pin-externals branch:
* subversion/tests/libsvn_client/client-test.c
(test_copy_pin_externals): Actually use the last item in the test data list.
Adjust
Author: stsp
Date: Thu Feb 12 18:49:17 2015
New Revision: 1659358
URL: http://svn.apache.org/r1659358
Log:
On the pin-externals branch, add a test case with an item that has an
operative and a peg revision.
* subversion/tests/libsvn_client/client-test.c
(test_copy_pin_externals): Add new case
Author: stsp
Date: Thu Feb 12 19:00:42 2015
New Revision: 1659363
URL: http://svn.apache.org/r1659363
Log:
On the pin-externals branch, make some stylistic tweaks in the C test.
No functional change.
* subversion/tests/libsvn_client/client-test.c
(test_copy_pin_externals): Use an array of
Author: stsp
Date: Thu Feb 12 19:11:41 2015
New Revision: 1659368
URL: http://svn.apache.org/r1659368
Log:
On the pin-externals branch, improve the C test.
* subversion/tests/libsvn_client/client-test.c
(test_copy_pin_externals): Ensure that all externals from test data
are checked when
Author: stsp
Date: Thu Feb 12 19:15:16 2015
New Revision: 1659370
URL: http://svn.apache.org/r1659370
Log:
On the pin-externals branch, improve the C test.
* subversion/tests/libsvn_client/client-test.c
(test_copy_pin_externals): Ensure that all externals from test data
are checked when
Author: stsp
Date: Thu Feb 12 19:20:22 2015
New Revision: 1659374
URL: http://svn.apache.org/r1659374
Log:
On the pin-externals branch, merge outstanding changes from trunk.
Modified:
subversion/branches/pin-externals/ (props changed)
subversion/branches/pin-externals/subversion
Author: stsp
Date: Thu Feb 12 20:38:01 2015
New Revision: 1659395
URL: http://svn.apache.org/r1659395
Log:
Merge the pin-externals branch to trunk.
The discussion thread start in this post:
http://mail-archives.apache.org/mod_mbox/subversion-dev/201501.mbox/%3C20150128095434.GM26869
Modified: subversion/trunk/subversion/libsvn_wc/externals.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/externals.c?rev=1659395&r1=1659394&r2=1659395&view=diff
==
--- subversion/trunk/subversion
Author: stsp
Date: Thu Feb 12 20:38:53 2015
New Revision: 1659396
URL: http://svn.apache.org/r1659396
Log:
Remove the pin-exernals branch, merged to trunk in r1659395.
Removed:
subversion/branches/pin-externals/
Author: stsp
Date: Thu Feb 12 21:04:52 2015
New Revision: 1659398
URL: http://svn.apache.org/r1659398
Log:
* CHANGES: Add an entry for 'svn copy --pin-externals'.
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/subver
Author: stsp
Date: Fri Feb 13 12:30:51 2015
New Revision: 1659536
URL: http://svn.apache.org/r1659536
Log:
Add a new test showing a regression in commit over ra_serf where it fails
to delete a directory tree containing many locked files.
The client-side error is: Unexpected HTTP status 400
Author: stsp
Date: Fri Feb 13 12:41:12 2015
New Revision: 1659542
URL: http://svn.apache.org/r1659542
Log:
* subversion/tests/cmdline/lock_tests.py
(delete_dir_with_lots_of_locked_files): Add issue number.
Modified:
subversion/trunk/subversion/tests/cmdline/lock_tests.py
Modified
Author: stsp
Date: Fri Mar 6 11:16:52 2015
New Revision: 1664586
URL: http://svn.apache.org/r1664586
Log:
* CHANGES: Fix 1.8.11 tag URL.
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1664586&r1=166
Author: stsp
Date: Fri Mar 6 11:55:32 2015
New Revision: 1664595
URL: http://svn.apache.org/r1664595
Log:
* CHANGES: List changes merged for 1.8.12.
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1664595
Author: stsp
Date: Fri Mar 6 13:19:07 2015
New Revision: 1664612
URL: http://svn.apache.org/r1664612
Log:
* CHANGES: List changes merged for 1.7.20. Not much as of yet.
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/subversion/trunk
Author: stsp
Date: Fri Mar 6 13:42:56 2015
New Revision: 1664619
URL: http://svn.apache.org/r1664619
Log:
* STATUS (for 1.7.x): Vote, approving 2 backports.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Date: Wed Mar 11 11:28:34 2015
New Revision: 1665846
URL: http://svn.apache.org/r1665846
Log:
* STATUS: Remove issue #4390 nomination, seems too unpopular.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc
Author: stsp
Date: Wed Mar 11 11:30:29 2015
New Revision: 1665847
URL: http://svn.apache.org/r1665847
Log:
* STATUS: Remove r1524145 nomination since it was vetoed and
I don't intend to pursue it further.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/
Author: stsp
Date: Wed Mar 11 12:09:42 2015
New Revision: 1665856
URL: http://svn.apache.org/r1665856
Log:
* STATUS: Vote for 1.8.x-r1573744-and-friends branch, approving.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org
Author: stsp
Date: Wed Mar 11 12:21:43 2015
New Revision: 1665860
URL: http://svn.apache.org/r1665860
Log:
* STATUS: Vote for r1651963 group, approving.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Date: Wed Mar 11 12:35:21 2015
New Revision: 1665866
URL: http://svn.apache.org/r1665866
Log:
* STATUS: Vote for 1.8.x-r1659867 branch, approving.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Revision: 1665871
Modified property: svn:log
Modified: svn:log at Wed Mar 11 13:28:20 2015
--
--- svn:log (original)
+++ svn:log Wed Mar 11 13:28:20 2015
@@ -1,4 +1,4 @@
-Fix a type in test name.
+Fix a typo
Author: stsp
Date: Wed Mar 11 13:27:23 2015
New Revision: 1665871
URL: http://svn.apache.org/r1665871
Log:
Fix a type in test name.
* subversion/tests/cmdline/externals_tests.py
(copy_pin_externals_whitepace_dir): Rename to ...
(copy_pin_externals_whitespace_dir): .. this.
(test_list
Author: stsp
Date: Wed Mar 11 13:42:16 2015
New Revision: 1665873
URL: http://svn.apache.org/r1665873
Log:
* tools/dev/wc-ng: Ignore svn-wc-db-tester.
Modified:
subversion/trunk/tools/dev/wc-ng/ (props changed)
Propchange: subversion/trunk/tools/dev/wc-ng
Author: stsp
Date: Wed Mar 11 14:19:11 2015
New Revision: 1665883
URL: http://svn.apache.org/r1665883
Log:
Create a backport branch for r1660220 and the corresponding test (r1665874).
The test change required resolving a text conflict and also requires slightly
different expectations for
Author: stsp
Date: Wed Mar 11 14:24:20 2015
New Revision: 1665885
URL: http://svn.apache.org/r1665885
Log:
On the 1.8.x-r1660220 branch, remove an accidentally added test which
was added in error during text conflict resolution.
Modified:
subversion/branches/1.8.x-r1660220/subversion/tests
Author: stsp
Date: Wed Mar 11 14:48:07 2015
New Revision: 1665889
URL: http://svn.apache.org/r1665889
Log:
* STATUS (1.9.x): Veto auth baton changes until plaintext caching is fixed.
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
http
Author: stsp
Date: Wed Mar 11 15:00:01 2015
New Revision: 1665891
URL: http://svn.apache.org/r1665891
Log:
* subversion/tests/cmdline/authz_tests.py: This file is for testing
authorization, not authentication. Fix file header comment.
Modified:
subversion/trunk/subversion/tests/cmdline
Author: stsp
Date: Wed Mar 11 15:45:54 2015
New Revision: 1665907
URL: http://svn.apache.org/r1665907
Log:
Add a regression test for the store-plaintext-passwords=no option.
This feature was briefly broken by accident between r1664078 and r1665886.
* subversion/tests/cmdline/basic_tests.py
Author: stsp
Date: Wed Mar 11 16:04:14 2015
New Revision: 1665919
URL: http://svn.apache.org/r1665919
Log:
* subversion/tests/cmdline/basic_tests.py
(plaintext_password_storage_disabled): Pass --non-interactive to 'svn'.
Modified:
subversion/trunk/subversion/tests/cmdline/basi
Author: stsp
Date: Wed Mar 11 16:16:16 2015
New Revision: 1665928
URL: http://svn.apache.org/r1665928
Log:
* STATUS (1.8.x): Vote for 1.8.x-r1660220 branch.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Date: Wed Mar 11 16:20:31 2015
New Revision: 1665931
URL: http://svn.apache.org/r1665931
Log:
* STATUS (1.8.x): Vote for r1660071.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x
Author: stsp
Date: Wed Mar 11 17:26:47 2015
New Revision: 1665948
URL: http://svn.apache.org/r1665948
Log:
* STATUS (1.9.x): Remove my veto for auth changes. The problem I was seeing
was none. There was a configuration error at my end.
Modified:
subversion/branches/1.9.x/STATUS
Modified
Author: stsp
Date: Wed Mar 11 16:14:03 2015
New Revision: 1665925
URL: http://svn.apache.org/r1665925
Log:
* STATUS (1.8.x): Vote for 1.8.x-r1660220 branch.
Modified:
subversion/branches/1.8.x-r1660220/STATUS
Modified: subversion/branches/1.8.x-r1660220/STATUS
URL:
http://svn.apache.org
Author: stsp
Date: Wed Mar 11 16:06:23 2015
New Revision: 1665922
URL: http://svn.apache.org/r1665922
Log:
* STATUS: Update my comment on auth baton changes.
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: stsp
Date: Wed Mar 11 16:14:58 2015
New Revision: 1665927
URL: http://svn.apache.org/r1665927
Log:
Revert r1665925, committed to the wrong branch.
Modified:
subversion/branches/1.8.x-r1660220/STATUS
Modified: subversion/branches/1.8.x-r1660220/STATUS
URL:
http://svn.apache.org
Author: stsp
Date: Thu Mar 12 11:10:06 2015
New Revision: 1666138
URL: http://svn.apache.org/r1666138
Log:
* STATUS: Vote for 1.8.x-r1660593 branch.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches
Author: stsp
Date: Thu Mar 12 13:53:29 2015
New Revision: 1666195
URL: http://svn.apache.org/r1666195
Log:
* STATUS: Vote for r1660646.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS
Author: stsp
Revision: 1663991
Modified property: svn:log
Modified: svn:log at Thu Mar 12 14:14:02 2015
--
--- svn:log (original)
+++ svn:log Thu Mar 12 14:14:02 2015
@@ -5,6 +5,7 @@ repository path), the node was
Author: stsp
Date: Thu Mar 12 14:16:43 2015
New Revision: 1666205
URL: http://svn.apache.org/r1666205
Log:
* STATUS: Vote for r1663991.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS
Author: stsp
Date: Thu Mar 12 14:27:26 2015
New Revision: 1666211
URL: http://svn.apache.org/r1666211
Log:
* STATUS: Vote for 1.8.x-r1664684 branch.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches
Author: stsp
Date: Thu Mar 12 14:42:57 2015
New Revision: 1666215
URL: http://svn.apache.org/r1666215
Log:
* STATUS: Vote for r1664531 group.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x
Author: stsp
Date: Tue Mar 17 09:17:47 2015
New Revision: 1667199
URL: http://svn.apache.org/r1667199
Log:
Provide a way for C tests to enable sleep for timestamps.
Needed for an upcoming new test. No functional change.
* subversion/tests/svn_test.h
(svn_test__enable_sleep_for_timestamps
Author: stsp
Date: Tue Mar 17 10:05:53 2015
New Revision: 1667228
URL: http://svn.apache.org/r1667228
Log:
Fix text conflict description for binary files.
The is_binary flag in conflict description was set to zero even
for binary files. As a result, 'svn resolve' offered 'min
Author: stsp
Date: Tue Mar 17 10:17:27 2015
New Revision: 1667234
URL: http://svn.apache.org/r1667234
Log:
* subversion/tests/libsvn_wc/conflict-data-test.c
(test_binary_file_conflict): Ensure that file size changes when
the binary file is changed. Makes sleep for timestamp unnecessary
Author: stsp
Date: Tue Mar 17 10:22:40 2015
New Revision: 1667237
URL: http://svn.apache.org/r1667237
Log:
Revert r1667199, which a disable-sleep-for-timestamps API for C tests.
These API was added for a new test committed in r1667228.
As of r1667234 the test does not need to disable sleep for
Author: stsp
Revision: 1667199
Modified property: svn:log
Modified: svn:log at Tue Mar 17 10:25:37 2015
--
--- svn:log (original)
+++ svn:log Tue Mar 17 10:25:37 2015
@@ -1,3 +1,5 @@
+[ Note from the future: Reverted in
Author: stsp
Date: Tue Mar 17 10:42:24 2015
New Revision: 1667249
URL: http://svn.apache.org/r1667249
Log:
* subversion/svn/conflict-callbacks.c
(handle_text_conflict): Don't allow diffs for binary files.
This restores the 'mine-full' and 'theirs-full' options f
Author: stsp
Date: Tue Mar 17 10:46:53 2015
New Revision: 1667250
URL: http://svn.apache.org/r1667250
Log:
* subversion/svn/conflict-callbacks.c
(handle_text_conflict): Clearly identify a binary file as 'binary' in the
conflict menu prompt.
Modified:
subversion/trunk/subv
Author: stsp
Date: Tue Mar 17 12:05:10 2015
New Revision: 1667280
URL: http://svn.apache.org/r1667280
Log:
Always install a .mine file for conflicted binary files, not just in
case the binary file was detranslated.
This makes the 'mine-full' option work again from the conflict prom
Author: stsp
Date: Tue Mar 17 12:23:54 2015
New Revision: 1667283
URL: http://svn.apache.org/r1667283
Log:
Follow-up to r1667280: Fix a test failure.
* subversion/tests/cmdline/update_tests.py
(update_binary_file): Add 'theta.mine' to extra on-disk files.
Modified:
subver
Author: stsp
Date: Wed Mar 18 10:26:50 2015
New Revision: 1667481
URL: http://svn.apache.org/r1667481
Log:
* CHANGES: List additional changes merged in time for 1.8.12.
Add a prospected release date for 1.8.12.
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL
Author: stsp
Date: Wed Mar 18 10:41:30 2015
New Revision: 1667485
URL: http://svn.apache.org/r1667485
Log:
* CHANGES: List more changes for 1.7.20. Add prospected 1.7.20 release date.
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
http://svn.apache.org/viewvc
Author: stsp
Date: Wed Mar 18 10:45:12 2015
New Revision: 1667486
URL: http://svn.apache.org/r1667486
Log:
CHANGES (1.8.x): Cherry-pick revisions related to 1.8 and 1.7 from trunk.
Modified:
subversion/branches/1.8.x/CHANGES (contents, props changed)
Modified: subversion/branches/1.8.x
Author: stsp
Date: Wed Mar 18 10:49:19 2015
New Revision: 1667487
URL: http://svn.apache.org/r1667487
Log:
* CHANGES (1.7.x): Cherry-pick revisions related to 1.7 from trunk/CHANGES.
Modified:
subversion/branches/1.7.x/CHANGES (contents, props changed)
Modified: subversion/branches/1.7.x
501 - 600 of 5356 matches
Mail list logo
