On the 1.6.x-issue3719 branch:
Fix compilation on Windows.
* subversion/libsvn_subr/io.c
(): Include private/svn_atomic.h. Add missing declaration of
tempname_counter (ifdef WIN32), which was probably lost during backporting.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-issue3719@1088808 13f79535-47bb-0310-9956-ffa450edef68
Fix compilation on Windows.
* subversion/libsvn_subr/io.c
(): Include private/svn_atomic.h. Add missing declaration of
tempname_counter (ifdef WIN32), which was probably lost during backporting.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-issue3719@1088808 13f79535-47bb-0310-9956-ffa450edef68
On the 1.6.x-issue3719 branch, backport a few performance-related
changes in the way temporary files are created.
Related thread:
Date: Thu, 03 Feb 2011 16:18:32 +0000
From: Neil Bird
To: dev@
Subject: [PATCH] issue #3719 fix slow large checkouts on Windows
Message-ID: <4D4AD558.3010705@jibbyjobby.co.uk>
http://svn.haxx.se/dev/archive-2011-02/0066.shtml
This backport does not have any mergeinfo associated with it.
The changes were made on trunk in several revisions, so it was easier
to just copy the current trunk code over and tweak it into shape instead
of merging individual revisions. For this reason, I've written a new log
message that describes the change.
Suggested by: Neil Bird <neil@jibbyjobby.co.uk>
(who also provided an initial patch, and tested this patch)
* subversion/libsvn_subr/io.c
(): Include svn_dirent_uri.h.
(temp_file_create): New helper. Uses apr_file_mktemp() on non-Windows systems.
On Windows systems, it uses a custom implementation that works much like
svn_io_open_uniquely_named(), but with a pseudo-random value for numbers
within the filename.
(svn_io_open_unique_file3): Instead of calling svn_io_open_uniquely_named(),
use temp_file_create().
(file_perms_set2): New helper. On trunk, this function has a sibling called
file_perms_set() which we don't need here.
(get_default_file_perms): Create a temporary file inside the function
instead of opening a file at a path provided by the caller.
As a performance optimisation, cache the default file permissions in
a static variable upon the first call. Subsequent calls will not go
to disk but return the cached value.
(merge_default_file_perms): New helper.
(io_set_file_perms): Don't overwrite existing permission bits when making
a file read-write.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-issue3719@1075950 13f79535-47bb-0310-9956-ffa450edef68
changes in the way temporary files are created.
Related thread:
Date: Thu, 03 Feb 2011 16:18:32 +0000
From: Neil Bird
To: dev@
Subject: [PATCH] issue #3719 fix slow large checkouts on Windows
Message-ID: <4D4AD558.3010705@jibbyjobby.co.uk>
http://svn.haxx.se/dev/archive-2011-02/0066.shtml
This backport does not have any mergeinfo associated with it.
The changes were made on trunk in several revisions, so it was easier
to just copy the current trunk code over and tweak it into shape instead
of merging individual revisions. For this reason, I've written a new log
message that describes the change.
Suggested by: Neil Bird <neil@jibbyjobby.co.uk>
(who also provided an initial patch, and tested this patch)
* subversion/libsvn_subr/io.c
(): Include svn_dirent_uri.h.
(temp_file_create): New helper. Uses apr_file_mktemp() on non-Windows systems.
On Windows systems, it uses a custom implementation that works much like
svn_io_open_uniquely_named(), but with a pseudo-random value for numbers
within the filename.
(svn_io_open_unique_file3): Instead of calling svn_io_open_uniquely_named(),
use temp_file_create().
(file_perms_set2): New helper. On trunk, this function has a sibling called
file_perms_set() which we don't need here.
(get_default_file_perms): Create a temporary file inside the function
instead of opening a file at a path provided by the caller.
As a performance optimisation, cache the default file permissions in
a static variable upon the first call. Subsequent calls will not go
to disk but return the cached value.
(merge_default_file_perms): New helper.
(io_set_file_perms): Don't overwrite existing permission bits when making
a file read-write.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-issue3719@1075950 13f79535-47bb-0310-9956-ffa450edef68
Create a backport branch for the issue #3719 fix.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-issue3719@1075930 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-issue3719@1075930 13f79535-47bb-0310-9956-ffa450edef68
Merge 1.6.16 section to CHANGES.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072956 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072956 13f79535-47bb-0310-9956-ffa450edef68
Reintegrate the 1.6.x-r880146 branch:
* r880146
When in `--dry-run' mode of `svn merge' command, property conflicts made an
interactive callback to the user to resolve the conflicts, unlike the text
conflicts. Suppress the interactive callback in `--dry-run' mode.
Justification:
A user asked me for it recently. Consistency. Removes an annoyance.
Simple patch.
Branch:
^/subversion/branches/1.6.x-r880146
Votes:
+1: julianfoad, stsp, pburba
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072351 13f79535-47bb-0310-9956-ffa450edef68
* r880146
When in `--dry-run' mode of `svn merge' command, property conflicts made an
interactive callback to the user to resolve the conflicts, unlike the text
conflicts. Suppress the interactive callback in `--dry-run' mode.
Justification:
A user asked me for it recently. Consistency. Removes an annoyance.
Simple patch.
Branch:
^/subversion/branches/1.6.x-r880146
Votes:
+1: julianfoad, stsp, pburba
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072351 13f79535-47bb-0310-9956-ffa450edef68
Merge r902467 from trunk:
* r902467
Fix broken svn_ra_get_mergeinfo API promise in serf and neon
implementations -- return a null mergeinfo catalog if there is
no mergeinfo, as per svn_ra_get_mergeinfo's API
Justification:
Fixes an uninitialized variable that can result in a segfault.
Votes:
+1: pburba, stsp, rhuijben
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072350 13f79535-47bb-0310-9956-ffa450edef68
* r902467
Fix broken svn_ra_get_mergeinfo API promise in serf and neon
implementations -- return a null mergeinfo catalog if there is
no mergeinfo, as per svn_ra_get_mergeinfo's API
Justification:
Fixes an uninitialized variable that can result in a segfault.
Votes:
+1: pburba, stsp, rhuijben
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072350 13f79535-47bb-0310-9956-ffa450edef68
Reintegrate the 1.6.x-r1058269 branch:
* r1058269
Fix issue #3486, "attempt to add tree conflict that already exists" again.
Justification:
Users should not be able to run into this situation.
Branch:
^/subversion/branches/1.6.x-r1058269
Votes:
+1: stsp, philip, rhuijben
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072347 13f79535-47bb-0310-9956-ffa450edef68
* r1058269
Fix issue #3486, "attempt to add tree conflict that already exists" again.
Justification:
Users should not be able to run into this situation.
Branch:
^/subversion/branches/1.6.x-r1058269
Votes:
+1: stsp, philip, rhuijben
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072347 13f79535-47bb-0310-9956-ffa450edef68
Merge r1064839 from trunk:
* r1064839
Additional fixes for issue #3270, required when the log is traversing
complex histories that max out our internal history cache.
Justification:
We backported part of this fix already -- we should finish the job.
Votes:
+1: cmpilato, stsp, philip
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072344 13f79535-47bb-0310-9956-ffa450edef68
* r1064839
Additional fixes for issue #3270, required when the log is traversing
complex histories that max out our internal history cache.
Justification:
We backported part of this fix already -- we should finish the job.
Votes:
+1: cmpilato, stsp, philip
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072344 13f79535-47bb-0310-9956-ffa450edef68
Reintegrate the 1.6.x-r1068988 branch:
* r1068988
Don't use globbing where it's not necessary.
Justification:
It's an easy optimisation well worth doing!
Branch:
^/subversion/branches/1.6.x-r1068988
Votes:
+1: stsp, julianfoad, philip (for the branch)
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072340 13f79535-47bb-0310-9956-ffa450edef68
* r1068988
Don't use globbing where it's not necessary.
Justification:
It's an easy optimisation well worth doing!
Branch:
^/subversion/branches/1.6.x-r1068988
Votes:
+1: stsp, julianfoad, philip (for the branch)
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072340 13f79535-47bb-0310-9956-ffa450edef68
Merge r1071239, r1071307 from trunk:
* r1071239, r1071307
Locks without athn SEGV in mod_dav_svn
Justification:
I think it can only happen during commit to a server that doesn't require
authn, but a server SEGV is bad.
Votes:
+1: philip, stsp, rhuijben
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072336 13f79535-47bb-0310-9956-ffa450edef68
* r1071239, r1071307
Locks without athn SEGV in mod_dav_svn
Justification:
I think it can only happen during commit to a server that doesn't require
authn, but a server SEGV is bad.
Votes:
+1: philip, stsp, rhuijben
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072336 13f79535-47bb-0310-9956-ffa450edef68
Create a backport branch...
... and retract my own vote, since I didn't test the backport (other than seeing
that the test passed). Sorry to just throw extra work at everyone.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072286 13f79535-47bb-0310-9956-ffa450edef68
... and retract my own vote, since I didn't test the backport (other than seeing
that the test passed). Sorry to just throw extra work at everyone.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072286 13f79535-47bb-0310-9956-ffa450edef68
Note backport branch.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072276 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072276 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Vote and approve r880146. Notes for r996383 and r1072084.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072130 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072130 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Vote for issue #3641 group.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072122 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072122 13f79535-47bb-0310-9956-ffa450edef68
Nominate r1072084, and clarify my old comment on #3641.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072088 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072088 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Vote and (conditionally) approve r1036429. It's conditional
because it depends on the issue #3641 group being merged first. If that
group isn't approved before the next release I'll create a backport branch
for this.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072070 13f79535-47bb-0310-9956-ffa450edef68
because it depends on the issue #3641 group being merged first. If that
group isn't approved before the next release I'll create a backport branch
for this.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072070 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Note backport branch for issue #3641 group.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072054 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072054 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Note r1036429 dependence on the issue #3641 group. Note that the
962377 group *is* issue #3641. Lastly, add r1036978 and r1037762 to the
issue #3641 group (those are needed to avoid a conflict and contain changes
to the test data that the other revisions in this group expect).
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072040 13f79535-47bb-0310-9956-ffa450edef68
962377 group *is* issue #3641. Lastly, add r1036978 and r1037762 to the
issue #3641 group (those are needed to avoid a conflict and contain changes
to the test data that the other revisions in this group expect).
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1072040 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Cast some votes
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071999 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071999 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Vote for r1058269, vote/approve r1064839, r1068988
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071975 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071975 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Vote for r880146.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071720 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071720 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Vote for r1068988. Add another justification for r880146.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071693 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071693 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Mention ^/subversion/branches/1.6.x-r1068988 backport branch.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071666 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071666 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Mention the backport branch for r880146.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071664 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071664 13f79535-47bb-0310-9956-ffa450edef68
On the '1.6.x-r880146' branch, merge r880146 from trunk.
Summary of original log message:
When in `--dry-run' mode of `svn merge' command, property conflicts made an
interactive callback to the user to resolve the conflicts, unlike the text
conflicts. Suppress the interactive callback in `--dry-run' mode.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r880146@1071618 13f79535-47bb-0310-9956-ffa450edef68
Summary of original log message:
When in `--dry-run' mode of `svn merge' command, property conflicts made an
interactive callback to the user to resolve the conflicts, unlike the text
conflicts. Suppress the interactive callback in `--dry-run' mode.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r880146@1071618 13f79535-47bb-0310-9956-ffa450edef68
Create a back-port branch '1.6.x-r880146'.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r880146@1071612 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r880146@1071612 13f79535-47bb-0310-9956-ffa450edef68
Merge r1051744, r1051745, r1053185, r1053241 from trunk, using the instructions
included below:
* r1051744, r1051745, r1053185, r1053241
Add additional assertions to the unit tests that use
svn_fs_commit_txn() and svn_repos_svn_commit_txn().
Justification:
Having additional assertions on svn_fs_commit_txn() and
svn_repos_svn_commit_txn() is good.
Branch:
^/subversion/branches/1.6.x-r1051744
More unit tests exist in trunk than the branch, so this branch
just ignores the rejected hunks.
This branch also has:
r1053185 merged into it
r1053241, an "original" commit that copies the definition of
SVN_TEST_ASSERT() into svn_test.h. This is an "original"
commit since there are no clean merges that would bring this
over.
Diff:
svn diff -x-p ^/subversion/branches/1.6.x@1052423 \
^/subversion/branches/1.6.x-r1051744@HEAD
Notes:
Merge all the changes on the 1.6.x-r1051744 branch and then merge
r1051745.
Votes:
+1: blair, danielsh, stsp
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071330 13f79535-47bb-0310-9956-ffa450edef68
included below:
* r1051744, r1051745, r1053185, r1053241
Add additional assertions to the unit tests that use
svn_fs_commit_txn() and svn_repos_svn_commit_txn().
Justification:
Having additional assertions on svn_fs_commit_txn() and
svn_repos_svn_commit_txn() is good.
Branch:
^/subversion/branches/1.6.x-r1051744
More unit tests exist in trunk than the branch, so this branch
just ignores the rejected hunks.
This branch also has:
r1053185 merged into it
r1053241, an "original" commit that copies the definition of
SVN_TEST_ASSERT() into svn_test.h. This is an "original"
commit since there are no clean merges that would bring this
over.
Diff:
svn diff -x-p ^/subversion/branches/1.6.x@1052423 \
^/subversion/branches/1.6.x-r1051744@HEAD
Notes:
Merge all the changes on the 1.6.x-r1051744 branch and then merge
r1051745.
Votes:
+1: blair, danielsh, stsp
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071330 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Point out another item that doesn't merge cleanly.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071326 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071326 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Cast some votes.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071324 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071324 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Add r1071307 to the r1071239 backport. (+1 from philip via IRC)
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071308 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071308 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Vote for r1071239.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071289 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071289 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: propose r1071239, vote for r962377
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071278 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071278 13f79535-47bb-0310-9956-ffa450edef68
Add revisions to the r962377 (#3641) group and remove Philip's veto,
per dev@.
I'm not changing my own vote for now --- that will come later hopefully.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071213 13f79535-47bb-0310-9956-ffa450edef68
per dev@.
I'm not changing my own vote for now --- that will come later hopefully.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071213 13f79535-47bb-0310-9956-ffa450edef68
* STATUS (1.6.x-svn_fs_commit_txn): Note thread, add placeholder vote.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071134 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1071134 13f79535-47bb-0310-9956-ffa450edef68
Merge r1058722 from trunk:
* r1058722
Initialize report_info_t's prop_encoding member in
libsvn_ra_serf/update.c:start_report() rather than using what was
previously in shared memory.
Justification:
No known problems with this, but using an unitialized struct member
is asking for problems.
Votes:
+1: pburba, danielsh, rhuijben
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1070669 13f79535-47bb-0310-9956-ffa450edef68
* r1058722
Initialize report_info_t's prop_encoding member in
libsvn_ra_serf/update.c:start_report() rather than using what was
previously in shared memory.
Justification:
No known problems with this, but using an unitialized struct member
is asking for problems.
Votes:
+1: pburba, danielsh, rhuijben
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1070669 13f79535-47bb-0310-9956-ffa450edef68
Merge r1053208 from trunk:
* r1053208
svn_error_raise_on_malfunction() needs to call svn_error__locate().
Justification:
If this is not done, then svn_error_raise_on_malfunction() will
not properly set the filename and line number in the svn_error_t
it creates.
Votes:
+1: blair, danielsh, rhuijben
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1070668 13f79535-47bb-0310-9956-ffa450edef68
* r1053208
svn_error_raise_on_malfunction() needs to call svn_error__locate().
Justification:
If this is not done, then svn_error_raise_on_malfunction() will
not properly set the filename and line number in the svn_error_t
it creates.
Votes:
+1: blair, danielsh, rhuijben
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1070668 13f79535-47bb-0310-9956-ffa450edef68
Merge r1051751 from trunk:
* r1051751
In a fsfs repository executing svn_fs_commit_txn(), ensure that
*new_rev is set to a valid revision as soon as the commit becomes
globally visible. Any errors in post commit FS processing should
not affect *new_rev.
Justification:
Having the code implement the documented API is a good thing.
Votes:
+1: blair, danielsh, rhuijben
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1070665 13f79535-47bb-0310-9956-ffa450edef68
* r1051751
In a fsfs repository executing svn_fs_commit_txn(), ensure that
*new_rev is set to a valid revision as soon as the commit becomes
globally visible. Any errors in post commit FS processing should
not affect *new_rev.
Justification:
Having the code implement the documented API is a good thing.
Votes:
+1: blair, danielsh, rhuijben
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1070665 13f79535-47bb-0310-9956-ffa450edef68
Merge r1051632, r1051638 from trunk:
* r1051632, r1051638
Ensure that *new_rev is set to an invalid revision before
attempting a commit, this helps implement svn_fs_commit_txn() and
svn_repos_fs_commit_txn()'s contract.
Justification:
Having the code implementing the documented API is a good thing.
Votes:
+1: blair, danielsh, rhuijben
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1070661 13f79535-47bb-0310-9956-ffa450edef68
* r1051632, r1051638
Ensure that *new_rev is set to an invalid revision before
attempting a commit, this helps implement svn_fs_commit_txn() and
svn_repos_fs_commit_txn()'s contract.
Justification:
Having the code implementing the documented API is a good thing.
Votes:
+1: blair, danielsh, rhuijben
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1070661 13f79535-47bb-0310-9956-ffa450edef68
Merge r1038792 from trunk:
* r1038792
Fix sporadic ruby test failures due to "Connection refused" errors.
Justification:
Tests failing for the wrong reason are irritating.
Votes:
+1: stsp, blair
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1070656 13f79535-47bb-0310-9956-ffa450edef68
* r1038792
Fix sporadic ruby test failures due to "Connection refused" errors.
Justification:
Tests failing for the wrong reason are irritating.
Votes:
+1: stsp, blair
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1070656 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r1068988.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1070593 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1070593 13f79535-47bb-0310-9956-ffa450edef68
11 years agoOn the 1.6.x-r1068988 branch, merge r1068988 from trunk, resolving conflicts.1.6.x-r10689881.6.x-r1068988
On the 1.6.x-r1068988 branch, merge r1068988 from trunk, resolving conflicts.
The new API added to trunk has been added as a static function within the
files that need it.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r1068988@1070591 13f79535-47bb-0310-9956-ffa450edef68
The new API added to trunk has been added as a static function within the
files that need it.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r1068988@1070591 13f79535-47bb-0310-9956-ffa450edef68
Create backport branch for r1068988
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r1068988@1070589 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r1068988@1070589 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Cast some votes; approving a few changes
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1070584 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1070584 13f79535-47bb-0310-9956-ffa450edef68
Move and add votes.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1070576 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1070576 13f79535-47bb-0310-9956-ffa450edef68
Vote for 1.6.x-r1051744.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1070565 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1070565 13f79535-47bb-0310-9956-ffa450edef68
Vote for r902467.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1070545 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1070545 13f79535-47bb-0310-9956-ffa450edef68
Vote, and move one entry to 'approved'.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1070531 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1070531 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r880146 for 1.6.x back-port.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1066961 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1066961 13f79535-47bb-0310-9956-ffa450edef68
Propose r1064839 for backport to 1.6.x.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1064843 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1064843 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r902467, an old segfault fix that slipped through the
cracks.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1064803 13f79535-47bb-0310-9956-ffa450edef68
cracks.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1064803 13f79535-47bb-0310-9956-ffa450edef68
* STATUS:
Nominate the 1.6.x-fsfs-begin-txn-deadlock branch.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1064003 13f79535-47bb-0310-9956-ffa450edef68
Nominate the 1.6.x-fsfs-begin-txn-deadlock branch.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1064003 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r1058722.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1058742 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1058742 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Wording fix in r1058269 nomination.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1058278 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1058278 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r1058269.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1058277 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1058277 13f79535-47bb-0310-9956-ffa450edef68
On the 1.6.x-r1058269 branch:
* subversion/libsvn_client/merge.c
(tree_conflict): Fix crash due to uninitialised pointer dereference bug
introduced during sloppy conflict resolution (ooops!).
Adjust a comment and remove an empty line, both to match trunk's code.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r1058269@1058276 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_client/merge.c
(tree_conflict): Fix crash due to uninitialised pointer dereference bug
introduced during sloppy conflict resolution (ooops!).
Adjust a comment and remove an empty line, both to match trunk's code.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r1058269@1058276 13f79535-47bb-0310-9956-ffa450edef68
On the 1.6.x-r1058269 branch, merge r1058269 from trunk, resolving conflicts.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r1058269@1058273 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r1058269@1058273 13f79535-47bb-0310-9956-ffa450edef68
Create a backport branch for r1058269.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r1058269@1058271 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r1058269@1058271 13f79535-47bb-0310-9956-ffa450edef68
Nominate r1053984 without voting.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1053990 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1053990 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate the 1.6.x-svn_fs_commit_txn branch.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1053506 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1053506 13f79535-47bb-0310-9956-ffa450edef68
* STATUS:
Clarify the documentation on merging r1051744, r1051745, r1053185
and r1053241 to the 1.6.x branch.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1053418 13f79535-47bb-0310-9956-ffa450edef68
Clarify the documentation on merging r1051744, r1051745, r1053185
and r1053241 to the 1.6.x branch.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1053418 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r1053208.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1053257 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1053257 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r1053241.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1053256 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1053256 13f79535-47bb-0310-9956-ffa450edef68
11 years agoOn the 1.6.x-r1051744 branch: add the definition of SVN_TEST_ASSERT1.6.x-r10517441.6.x-r1051744
On the 1.6.x-r1051744 branch: add the definition of SVN_TEST_ASSERT
which is not yet in this branch. There are no clean merges of this
definition, so I copied it in.
* subversion/tests/svn_test.h
(SVN_TEST_ASSERT):
New definition copied from trunk r1053238.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r1051744@1053241 13f79535-47bb-0310-9956-ffa450edef68
which is not yet in this branch. There are no clean merges of this
definition, so I copied it in.
* subversion/tests/svn_test.h
(SVN_TEST_ASSERT):
New definition copied from trunk r1053238.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r1051744@1053241 13f79535-47bb-0310-9956-ffa450edef68
Merge r947006 from trunk:
* r947006
Fix JVM object leak.
Justification:
Without this fix, dumping repositories with a large number of revisions
or files crashes.
Votes:
+1: hwright
+0.5: blair
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1053211 13f79535-47bb-0310-9956-ffa450edef68
* r947006
Fix JVM object leak.
Justification:
Without this fix, dumping repositories with a large number of revisions
or files crashes.
Votes:
+1: hwright
+0.5: blair
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1053211 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r1053185.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1053197 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1053197 13f79535-47bb-0310-9956-ffa450edef68
On the 1.6.x-r1051744 branch: merge 1053185 from trunk, using
--accept=mine-conflict. All the conflicts are from unit tests on
trunk that are not in the 1.6.x branch.
This commit does s/SVN_ERR_ASSERT/SVN_TEST_ASSERT/g on all the new
unit tests in this branch.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r1051744@1053195 13f79535-47bb-0310-9956-ffa450edef68
--accept=mine-conflict. All the conflicts are from unit tests on
trunk that are not in the 1.6.x branch.
This commit does s/SVN_ERR_ASSERT/SVN_TEST_ASSERT/g on all the new
unit tests in this branch.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r1051744@1053195 13f79535-47bb-0310-9956-ffa450edef68
* STATUS:
Move r947006 to approved with 1.5 votes, since it is a binding
change, this requires fewer votes.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1053193 13f79535-47bb-0310-9956-ffa450edef68
Move r947006 to approved with 1.5 votes, since it is a binding
change, this requires fewer votes.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1053193 13f79535-47bb-0310-9956-ffa450edef68
Chinese translation update on the '1.6.x' branch:
* subversion/po/zh_CN.po: Update Chinese translation.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1052829 13f79535-47bb-0310-9956-ffa450edef68
* subversion/po/zh_CN.po: Update Chinese translation.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1052829 13f79535-47bb-0310-9956-ffa450edef68
* STATUS:
Nominate a few merges for svn_fs_commit_txn() and svn_repos_fs_txn_commit().
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1052428 13f79535-47bb-0310-9956-ffa450edef68
Nominate a few merges for svn_fs_commit_txn() and svn_repos_fs_txn_commit().
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1052428 13f79535-47bb-0310-9956-ffa450edef68
On the 1.6.x-r1051744 branch: merge r1051744 from trunk, using
--accept=mine-conflict. All the conflicts are from unit tests on
trunk that are not in the 1.6.x branch.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r1051744@1052427 13f79535-47bb-0310-9956-ffa450edef68
--accept=mine-conflict. All the conflicts are from unit tests on
trunk that are not in the 1.6.x branch.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r1051744@1052427 13f79535-47bb-0310-9956-ffa450edef68
* branches/1.6.x-r1051744:
New branch copied from 1.6.x to merge in r1051744 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r1051744@1052424 13f79535-47bb-0310-9956-ffa450edef68
New branch copied from 1.6.x to merge in r1051744 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r1051744@1052424 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Voty voty, being on a train gives time to do reviews.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1052423 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1052423 13f79535-47bb-0310-9956-ffa450edef68
* STATUS:
Fix indentation for two suggested merges.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1052421 13f79535-47bb-0310-9956-ffa450edef68
Fix indentation for two suggested merges.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1052421 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r947006.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1044037 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1044037 13f79535-47bb-0310-9956-ffa450edef68
Nominated r1041638 for backport to the 1.6.x branch.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1041641 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1041641 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Move r1028084 group out of the veto list.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1041589 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1041589 13f79535-47bb-0310-9956-ffa450edef68
Merge r1041438 from trunk:
* r1041438
Further improvement to a previously backported blame -g server-side
memory leak fix (r1032808).
Justification:
Very simple change that fixes another memory leak.
Notes:
In the test case described in
http://svn.haxx.se/dev/archive-2010-11/0163.shtml, r1032808 dropped
svnserve's peak memory use from 574 MB to 71 MB. r1041438 further
drops it to 51 MB.
Votes:
+1: pburba, hwright, cmpilato (via IRC)
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1041504 13f79535-47bb-0310-9956-ffa450edef68
* r1041438
Further improvement to a previously backported blame -g server-side
memory leak fix (r1032808).
Justification:
Very simple change that fixes another memory leak.
Notes:
In the test case described in
http://svn.haxx.se/dev/archive-2010-11/0163.shtml, r1032808 dropped
svnserve's peak memory use from 574 MB to 71 MB. r1041438 further
drops it to 51 MB.
Votes:
+1: pburba, hwright, cmpilato (via IRC)
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1041504 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Vote and approve.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1041499 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1041499 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Add cmpilato's IRC vote for r1041438.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1041473 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1041473 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r1041438 (more server-side blame -g memory improvements).
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1041461 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1041461 13f79535-47bb-0310-9956-ffa450edef68
Nominated r1028084 and r1028125 for 1.6.x backport.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1040345 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1040345 13f79535-47bb-0310-9956-ffa450edef68
Merge r1039040 from trunk:
* r1039040
Use Perl to resolve symlinks when building the SWIG Perl bindings.
Justification:
r1038808 made Python a requirement to build the Perl bindings
Votes:
+1: philip, stsp
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1039116 13f79535-47bb-0310-9956-ffa450edef68
* r1039040
Use Perl to resolve symlinks when building the SWIG Perl bindings.
Justification:
r1038808 made Python a requirement to build the Perl bindings
Votes:
+1: philip, stsp
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1039116 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Vote for r1039040, approving.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1039115 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1039115 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: change vote for svnsync/copyfrom to veto, propose r1039040
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1039113 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1039113 13f79535-47bb-0310-9956-ffa450edef68
Merge r1036534 from trunk:
* r1036534
Allow perl bindings to compile within a symlinked working copy.
Justification:
When it happens, it's a very confusing build error.
Votes:
+1: stsp, danielsh
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1038808 13f79535-47bb-0310-9956-ffa450edef68
* r1036534
Allow perl bindings to compile within a symlinked working copy.
Justification:
When it happens, it's a very confusing build error.
Votes:
+1: stsp, danielsh
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1038808 13f79535-47bb-0310-9956-ffa450edef68
Merge r946355 from trunk. Daniel Shahaf reminded me that we only need
two votes for changes to the bindings. So this has already been approved.
* r946355
Don't overwrite the LD_LIBRARY_PATH during make check-swig-pl.
Justification:
Allows running the perl bindings tests even if Subversion has been
linked to libraries which aren't in the standard system search path.
Who'd do such a thing? Well, I do that -- most dependencies for my
Subversion builds are installed within my home directory and the
runtime linker isn't searching libraries there by default.
Votes:
+1: stsp, peters
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1038807 13f79535-47bb-0310-9956-ffa450edef68
two votes for changes to the bindings. So this has already been approved.
* r946355
Don't overwrite the LD_LIBRARY_PATH during make check-swig-pl.
Justification:
Allows running the perl bindings tests even if Subversion has been
linked to libraries which aren't in the standard system search path.
Who'd do such a thing? Well, I do that -- most dependencies for my
Subversion builds are installed within my home directory and the
runtime linker isn't searching libraries there by default.
Votes:
+1: stsp, peters
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1038807 13f79535-47bb-0310-9956-ffa450edef68
Vote for r1036534.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1038806 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1038806 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r1038792.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1038794 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1038794 13f79535-47bb-0310-9956-ffa450edef68
* CHANGES (for 1.6.x): Merge outstanding changes from trunk.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1038589 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1038589 13f79535-47bb-0310-9956-ffa450edef68
Post-release version bump.
* STATUS,
subversion/include/svn_version.h:
Bump to 1.6.16.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1038151 13f79535-47bb-0310-9956-ffa450edef68
* STATUS,
subversion/include/svn_version.h:
Bump to 1.6.16.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1038151 13f79535-47bb-0310-9956-ffa450edef68
* CHANGES:
Bring up-to-date with trunk.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1038135 13f79535-47bb-0310-9956-ffa450edef68
Bring up-to-date with trunk.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1038135 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Vote for r946355.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1037361 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1037361 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Retract my vote for the svnsync-copyfrom group.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1037029 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1037029 13f79535-47bb-0310-9956-ffa450edef68
In an effort to actually cut a 1.6.x release, reverse merge r1033111, which
was itself a merge of r962377 and r962378 from trunk.
This merge created a test failure of svnsync on bdb, and this failure was not
easily understood or fixed, so we're backing out the change in favor of
cutting a release, and pushing a proper fix for this to a future release.
stsp, pburba, hwright and danielsh were all in agreement on this.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1037005 13f79535-47bb-0310-9956-ffa450edef68
was itself a merge of r962377 and r962378 from trunk.
This merge created a test failure of svnsync on bdb, and this failure was not
easily understood or fixed, so we're backing out the change in favor of
cutting a release, and pushing a proper fix for this to a future release.
stsp, pburba, hwright and danielsh were all in agreement on this.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1037005 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Cast a cowardly, waffling vote for r1036429.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1036995 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1036995 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Downgrade my vote for r1036429.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1036686 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1036686 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r946355.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1036667 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1036667 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Vote for r1036429.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1036664 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1036664 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r1036534.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1036539 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1036539 13f79535-47bb-0310-9956-ffa450edef68
Merge r991972 from trunk, using special merge magic:
* r991972
Replace os.rename(src,dst) with shutil.move() while setting up authz files
in the test suite.
Notes:
On most linux variants, os.rename(src,dst) will tolerate an existing
dst, but Windows will not. The change to use os.rename() was made in
the backport of r991534.
Justification:
With r991534 backported, we can no longer run the dav tests on Windows
without this change.
Branch:
No branch is required, however r991972 was made in sandbox.py, which
doesn't exist on 1.6.x. A file merge from sandbox.py to main.py on
the 1.6.x branch will cleanly apply the one line change, i.e.:
svn merge ^/subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py
subversion/tests/cmdline/svntest/main.py -c991972
Votes:
+1: pburba, stsp, rhuijben
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1036520 13f79535-47bb-0310-9956-ffa450edef68
* r991972
Replace os.rename(src,dst) with shutil.move() while setting up authz files
in the test suite.
Notes:
On most linux variants, os.rename(src,dst) will tolerate an existing
dst, but Windows will not. The change to use os.rename() was made in
the backport of r991534.
Justification:
With r991534 backported, we can no longer run the dav tests on Windows
without this change.
Branch:
No branch is required, however r991972 was made in sandbox.py, which
doesn't exist on 1.6.x. A file merge from sandbox.py to main.py on
the 1.6.x branch will cleanly apply the one line change, i.e.:
svn merge ^/subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py
subversion/tests/cmdline/svntest/main.py -c991972
Votes:
+1: pburba, stsp, rhuijben
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1036520 13f79535-47bb-0310-9956-ffa450edef68