Tagging 1.5.9 release with svn_version.h matching tarball.
git-svn-id: https://svn.apache.org/repos/asf/subversion/tags/1.5.9@1041584 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/tags/1.5.9@1041584 13f79535-47bb-0310-9956-ffa450edef68
Bring CHANGES up-to-date with trunk for the 1.5.9 release.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041577 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041577 13f79535-47bb-0310-9956-ffa450edef68
Merge r880162 from trunk:
* r880162
Fix ruby test failure caused by the merge of r879293.
Justification:
Failing tests are bad.
Votes:
+1: hwright, cmpilato
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041567 13f79535-47bb-0310-9956-ffa450edef68
* r880162
Fix ruby test failure caused by the merge of r879293.
Justification:
Failing tests are bad.
Votes:
+1: hwright, cmpilato
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041567 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Move r880162 to approved (2 votes for bindings work)
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041566 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041566 13f79535-47bb-0310-9956-ffa450edef68
Vote for r880162.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041565 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041565 13f79535-47bb-0310-9956-ffa450edef68
Reintegrate the 1.5.x-serf-config branch:
* 1.5.x-serf-config branch
Block Subversion from compiling with too-new serf versions.
Justification:
Prevent user confusion in the presence of incompatible serf installs.
Votes:
+1: peters, philip, cmpilato
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041564 13f79535-47bb-0310-9956-ffa450edef68
* 1.5.x-serf-config branch
Block Subversion from compiling with too-new serf versions.
Justification:
Prevent user confusion in the presence of incompatible serf installs.
Votes:
+1: peters, philip, cmpilato
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041564 13f79535-47bb-0310-9956-ffa450edef68
Vote for 1.5.x-serf-config, approving.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041562 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041562 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Add fix for ruby test failure.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041560 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041560 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: vote for 1.5.x-serf-config
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041555 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041555 13f79535-47bb-0310-9956-ffa450edef68
* 1.5.x/STATUS: Vote for my serf detect patch.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041549 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041549 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Add the serf version-blocking item.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041546 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041546 13f79535-47bb-0310-9956-ffa450edef68
On the 1.5.x-serf-config branch:
* build/ac-macros/serf.m4
(SVN_LIB_SERF): Do a compile test to ensure serf version is 0.3.x or
below, if --with-serf is specified.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-serf-config@1041545 13f79535-47bb-0310-9956-ffa450edef68
* build/ac-macros/serf.m4
(SVN_LIB_SERF): Do a compile test to ensure serf version is 0.3.x or
below, if --with-serf is specified.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-serf-config@1041545 13f79535-47bb-0310-9956-ffa450edef68
Create a branch to add serf-version blocking on the 1.5.x branch.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-serf-config@1041544 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-serf-config@1041544 13f79535-47bb-0310-9956-ffa450edef68
Merge r1041438 from trunk:
* r1041438
Further improvement to an approved backport of a 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.5.x@1041506 13f79535-47bb-0310-9956-ffa450edef68
* r1041438
Further improvement to an approved backport of a 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.5.x@1041506 13f79535-47bb-0310-9956-ffa450edef68
Merge r880082 from trunk:
* r880082
Respect Apache's ServerSignature directive.
Justification:
Many subversion server administrators want it.
Votes:
+1: stylesen, cmpilato, hwright
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041503 13f79535-47bb-0310-9956-ffa450edef68
* r880082
Respect Apache's ServerSignature directive.
Justification:
Many subversion server administrators want it.
Votes:
+1: stylesen, cmpilato, hwright
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041503 13f79535-47bb-0310-9956-ffa450edef68
Merge r879293 from trunk:
* r879293
Perform MIME type matching case-insensitively. (Issue #3479)
Justification:
The broken behavior is inconsistent with the way MIME mapping
files are used everywhere else in the world.
Notes:
This merge will conflict due to changes in the path APIs. Use
--accept=theirs-conflict to merge it, and then replace the one
introduced call to svn_dirent_local_style() with svn_path_local_style().
Votes:
+1: cmpilato, pburba, hwright
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041501 13f79535-47bb-0310-9956-ffa450edef68
* r879293
Perform MIME type matching case-insensitively. (Issue #3479)
Justification:
The broken behavior is inconsistent with the way MIME mapping
files are used everywhere else in the world.
Notes:
This merge will conflict due to changes in the path APIs. Use
--accept=theirs-conflict to merge it, and then replace the one
introduced call to svn_dirent_local_style() with svn_path_local_style().
Votes:
+1: cmpilato, pburba, hwright
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041501 13f79535-47bb-0310-9956-ffa450edef68
Merge r877842 from trunk:
* r877842
Make svnadmin load tolerate mergeinfo with "\r\n".
Justification:
Prior to this change you cannot load a dump file that contains Windows
style newlines in svn:mergeinfo. See
http://svn.haxx.se/dev/archive-2009-05/0179.shtml.
Votes:
+1: pburba, cmpilato, hwright
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041498 13f79535-47bb-0310-9956-ffa450edef68
* r877842
Make svnadmin load tolerate mergeinfo with "\r\n".
Justification:
Prior to this change you cannot load a dump file that contains Windows
style newlines in svn:mergeinfo. See
http://svn.haxx.se/dev/archive-2009-05/0179.shtml.
Votes:
+1: pburba, cmpilato, hwright
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041498 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Add some votes of my own.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041495 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041495 13f79535-47bb-0310-9956-ffa450edef68
Merge r1032808 from trunk:
* r1032808
Fix blame -g server-side memory leaks.
Justification:
As detailed in http://svn.haxx.se/dev/archive-2010-11/0102.shtml,
blame -g can trigger a serious server side memory leak.
Votes:
+1: stsp, philip, pburba
(For 1.6.x there was +1: pburba, cmpilato, hwright)
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041488 13f79535-47bb-0310-9956-ffa450edef68
* r1032808
Fix blame -g server-side memory leaks.
Justification:
As detailed in http://svn.haxx.se/dev/archive-2010-11/0102.shtml,
blame -g can trigger a serious server side memory leak.
Votes:
+1: stsp, philip, pburba
(For 1.6.x there was +1: pburba, cmpilato, hwright)
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041488 13f79535-47bb-0310-9956-ffa450edef68
Merge r1022675 from trunk:
* r1022675 (r982355 from ^subversion/branches/performance)
Limit the amount of unused memory fragments held by the root pools.
Justification:
In combination with blame -g server side memory leaks, see r1032808 and
http://svn.haxx.se/dev/archive-2010-11/0102.shtml, svnserve's memory
usage can get bloated and stay that way, see
see http://svn.haxx.se/dev/archive-2010-11/0165.shtml.
Notes:
Use --accept=mine-full to avoid bizzare branch root property conflicts
on 'svn:ignore' and 'bugtraq:logregex'.
Votes:
+1: stsp, philip, pburba
(For 1.6.x there was +1: pburba, cmpilato, hwright)
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041487 13f79535-47bb-0310-9956-ffa450edef68
* r1022675 (r982355 from ^subversion/branches/performance)
Limit the amount of unused memory fragments held by the root pools.
Justification:
In combination with blame -g server side memory leaks, see r1032808 and
http://svn.haxx.se/dev/archive-2010-11/0102.shtml, svnserve's memory
usage can get bloated and stay that way, see
see http://svn.haxx.se/dev/archive-2010-11/0165.shtml.
Notes:
Use --accept=mine-full to avoid bizzare branch root property conflicts
on 'svn:ignore' and 'bugtraq:logregex'.
Votes:
+1: stsp, philip, pburba
(For 1.6.x there was +1: pburba, cmpilato, hwright)
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041487 13f79535-47bb-0310-9956-ffa450edef68
Reintegrate the 1.5.x-r36775 branch:
* r876804, r876840, r876849
Fix issue #3383 'Foreign repository merge can add mergeinfo from the
foreign repos'
Justification:
At best this mergeinfo refers to non-existent paths in the target's
repos. At worst the mergeinfo intersects with actual path/revisions
in the merge target. The latter might cause real problems, making it
appear merges have been done that actually have not or vice-versa.
Notes:
r876849 is the fix, the other revisions are expansion of an existing
merge test to cover this issue. There are some minor conflicts, a
backport branch can be found at ^subversion/branches/1.5.x-r36775.
Votes:
+1: pburba, arfrever, cmpilato
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041483 13f79535-47bb-0310-9956-ffa450edef68
* r876804, r876840, r876849
Fix issue #3383 'Foreign repository merge can add mergeinfo from the
foreign repos'
Justification:
At best this mergeinfo refers to non-existent paths in the target's
repos. At worst the mergeinfo intersects with actual path/revisions
in the merge target. The latter might cause real problems, making it
appear merges have been done that actually have not or vice-versa.
Notes:
r876849 is the fix, the other revisions are expansion of an existing
merge test to cover this issue. There are some minor conflicts, a
backport branch can be found at ^subversion/branches/1.5.x-r36775.
Votes:
+1: pburba, arfrever, cmpilato
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041483 13f79535-47bb-0310-9956-ffa450edef68
Merge r876097 from trunk:
* r876097
Resolve symlinks when checking ~/.subversion
Justification:
It gives flexibility to users to link different .subversion folders.
Votes:
+1: stylesen, stsp, cmpilato
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041482 13f79535-47bb-0310-9956-ffa450edef68
* r876097
Resolve symlinks when checking ~/.subversion
Justification:
It gives flexibility to users to link different .subversion folders.
Votes:
+1: stylesen, stsp, cmpilato
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041482 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Vote for r879293 and add cmpilato's IRC vote for r1041438.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041474 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041474 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.5.x@1041462 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041462 13f79535-47bb-0310-9956-ffa450edef68
Note how to resolve conflicts with the merge of the r879293 group.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041421 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041421 13f79535-47bb-0310-9956-ffa450edef68
Cast more votes, approving one change. (While here, keep approved changes
rev-ordered.)
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041415 13f79535-47bb-0310-9956-ffa450edef68
rev-ordered.)
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041415 13f79535-47bb-0310-9956-ffa450edef68
Vote for the r876804 group, approving.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041411 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041411 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Vote and approve r1022675 and r1032808.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041401 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041401 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: vote for r1022675, r1032808
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041390 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041390 13f79535-47bb-0310-9956-ffa450edef68
* STATUS (for 1.5.x): Nominate r1022675 and r1032808 (blame -g server-side
memory leak which can cause a crash).
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041364 13f79535-47bb-0310-9956-ffa450edef68
memory leak which can cause a crash).
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041364 13f79535-47bb-0310-9956-ffa450edef68
Post-release version bump. It's doubtful this will ever see the light of day,
but just for completeness' sake...
* STATUS,
subversion/include/svn_version.h:
Bump to 1.5.9.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041199 13f79535-47bb-0310-9956-ffa450edef68
but just for completeness' sake...
* STATUS,
subversion/include/svn_version.h:
Bump to 1.5.9.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041199 13f79535-47bb-0310-9956-ffa450edef68
* CHANGES:
Update with 1.5.8 section.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041089 13f79535-47bb-0310-9956-ffa450edef68
Update with 1.5.8 section.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041089 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Some votes and notes.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041033 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1041033 13f79535-47bb-0310-9956-ffa450edef68
* STATUS (for 1.5.x): Revoke some entries I've added. They aren't critical
fixes (auto-props item) or can be worked around easily (neon version check).
Also add -0 vote for another backport.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1040610 13f79535-47bb-0310-9956-ffa450edef68
fixes (auto-props item) or can be worked around easily (neon version check).
Also add -0 vote for another backport.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1040610 13f79535-47bb-0310-9956-ffa450edef68
Nominated r1028084 and r1028125 for 1.5.x backport.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1040344 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1040344 13f79535-47bb-0310-9956-ffa450edef68
* STATUS (for 1.5.x): Nominate r873346 and r879357.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1038655 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1038655 13f79535-47bb-0310-9956-ffa450edef68
Merge r1033166 from trunk:
* r1033166
Prevent mod_dav_svn from trying to walk SVNParentPath collections.
Justification:
Without this fix, mod_dav_svn can be made to crash if the SVNParentPath
directive is used.
Votes:
+1: stsp, philip, cmpilato
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1033337 13f79535-47bb-0310-9956-ffa450edef68
* r1033166
Prevent mod_dav_svn from trying to walk SVNParentPath collections.
Justification:
Without this fix, mod_dav_svn can be made to crash if the SVNParentPath
directive is used.
Votes:
+1: stsp, philip, cmpilato
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1033337 13f79535-47bb-0310-9956-ffa450edef68
Vote for r1033166, approving.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1033335 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1033335 13f79535-47bb-0310-9956-ffa450edef68
* STATUS (for 1.5.x): Add philip's vote from IRC.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1033263 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1033263 13f79535-47bb-0310-9956-ffa450edef68
Merge r1000038, r1000060 from trunk:
* r1000038, r1000060
Fix for issue #3695, in which the use of "SVNPathAuthz short_circuit"
causes Subversion to ignore authz access rule sections which
contain a repository prefix.
Justification:
Rules are made to be broken. Except when they're access rules.
Notes:
r1000038 is a whitespace-only fix required to make r1000060
cleanly merge.
Votes:
+1: cmpilato, kameshj, stsp
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1033230 13f79535-47bb-0310-9956-ffa450edef68
* r1000038, r1000060
Fix for issue #3695, in which the use of "SVNPathAuthz short_circuit"
causes Subversion to ignore authz access rule sections which
contain a repository prefix.
Justification:
Rules are made to be broken. Except when they're access rules.
Notes:
r1000038 is a whitespace-only fix required to make r1000060
cleanly merge.
Votes:
+1: cmpilato, kameshj, stsp
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1033230 13f79535-47bb-0310-9956-ffa450edef68
* STATUS (for 1.5.x): Vote for the issue #3729 security fix, approving.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1033223 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1033223 13f79535-47bb-0310-9956-ffa450edef68
* STATUS (for 1.5.x): Nominate r1033166.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1033218 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1033218 13f79535-47bb-0310-9956-ffa450edef68
*STATUS: Vote for r1000038, r1000060
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1002081 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1002081 13f79535-47bb-0310-9956-ffa450edef68
Add r1000038 to r1000060, and note why.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1001891 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1001891 13f79535-47bb-0310-9956-ffa450edef68
Propose r1000060 for backport.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1000067 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@1000067 13f79535-47bb-0310-9956-ffa450edef68
* COMMITTERS: Merge r880450 from trunk to update my email address.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@904182 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@904182 13f79535-47bb-0310-9956-ffa450edef68
* COMMITTERS: Update my email address.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@902205 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@902205 13f79535-47bb-0310-9956-ffa450edef68
Add 840074 to all revnums, except those in branch names.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@881943 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@881943 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r40200 and 40201 for backport to 1.5.x.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@880456 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@880456 13f79535-47bb-0310-9956-ffa450edef68
On the '1.5.x' branch:
* STATUS: Nominate r40008.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@880084 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r40008.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@880084 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r39109.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@879746 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@879746 13f79535-47bb-0310-9956-ffa450edef68
Propose r39219 for backport. (And fix indentation inconsistency. Again.)
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@879294 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@879294 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Vote for r36023
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878820 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878820 13f79535-47bb-0310-9956-ffa450edef68
On the '1.5.x' branch:
* STATUS: Nominate r36023.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878817 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r36023.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878817 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: nominate svnsync bugfix for 1.5.x.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878798 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878798 13f79535-47bb-0310-9956-ffa450edef68
Merge r38608 from trunk, adding the 1.5.7 section to CHANGES.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878684 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878684 13f79535-47bb-0310-9956-ffa450edef68
Merge r38599 from trunk. This patch addresses CVE-2009-2411, and was
released as part of the 1.5.7 security release.
[ I cheated and didn't really merge the change, but just applied the patch
in the CVE and did a record-only merge. ]
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878680 13f79535-47bb-0310-9956-ffa450edef68
released as part of the 1.5.7 security release.
[ I cheated and didn't really merge the change, but just applied the patch
in the CVE and did a record-only merge. ]
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878680 13f79535-47bb-0310-9956-ffa450edef68
Post-release housekeeping:
* STATUS,
subversion/include/svn_version.h:
Bump version numbers.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878678 13f79535-47bb-0310-9956-ffa450edef68
* STATUS,
subversion/include/svn_version.h:
Bump version numbers.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878678 13f79535-47bb-0310-9956-ffa450edef68
Merge r37117 from trunk:
* r37117
Fix issue #3393 'Merge consuming too much memory'.
Justification:
A merge which targets a WC with thousands of subtrees with mergeinfo
can consume multiple GB of memory in a hurry.
Notes:
This is as simple a fix to review as you've ever seen with the
word 'merge' in the title (though as gstein points out, the
function this change is in desperately needs a dose of clarity).
Votes:
+1: pburba, hwright, cmpilato
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878310 13f79535-47bb-0310-9956-ffa450edef68
* r37117
Fix issue #3393 'Merge consuming too much memory'.
Justification:
A merge which targets a WC with thousands of subtrees with mergeinfo
can consume multiple GB of memory in a hurry.
Notes:
This is as simple a fix to review as you've ever seen with the
word 'merge' in the title (though as gstein points out, the
function this change is in desperately needs a dose of clarity).
Votes:
+1: pburba, hwright, cmpilato
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878310 13f79535-47bb-0310-9956-ffa450edef68
Merge r37385 from trunk:
* r37385
Return an error if attempting to reintegrate from/to the repository root.
Justification:
A descriptive error is a lot better than a cryptic assertion, see
http://svn.haxx.se/dev/archive-2009-04/0623.shtml.
Votes:
+1: pburba, arfrever, cmpilato
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878309 13f79535-47bb-0310-9956-ffa450edef68
* r37385
Return an error if attempting to reintegrate from/to the repository root.
Justification:
A descriptive error is a lot better than a cryptic assertion, see
http://svn.haxx.se/dev/archive-2009-04/0623.shtml.
Votes:
+1: pburba, arfrever, cmpilato
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878309 13f79535-47bb-0310-9956-ffa450edef68
Reintegrate the 1.5.x-r37156 branch:
* r37156
Make default depth of merge infinity, rather than the depth of target.
Justification:
Is it technically a bug? Dunno, but there is nothing but confusion
regarding the old behavior, see
http://svn.haxx.se/dev/archive-2009-04/0328.shtml and
http://svn.haxx.se/dev/archive-2009-03/0701.shtml.
Notes:
Changes to the merge tests in r37156 expect tree conflicts which
obviously don't exist in 1.5.x. Created a backport branch at
http://svn.collab.net/repos/svn/branches/1.5.x-r37156 which adjusts
the test to expect skips rather than tree conflicts.
Votes:
+1: pburba, arfrever, cmpilato
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878307 13f79535-47bb-0310-9956-ffa450edef68
* r37156
Make default depth of merge infinity, rather than the depth of target.
Justification:
Is it technically a bug? Dunno, but there is nothing but confusion
regarding the old behavior, see
http://svn.haxx.se/dev/archive-2009-04/0328.shtml and
http://svn.haxx.se/dev/archive-2009-03/0701.shtml.
Notes:
Changes to the merge tests in r37156 expect tree conflicts which
obviously don't exist in 1.5.x. Created a backport branch at
http://svn.collab.net/repos/svn/branches/1.5.x-r37156 which adjusts
the test to expect skips rather than tree conflicts.
Votes:
+1: pburba, arfrever, cmpilato
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878307 13f79535-47bb-0310-9956-ffa450edef68
Reintegrate the 1.5.x-r37169 branch:
* r37169
Update --set-depth infinity should expand shallow subtrees.
Justification:
update --set-depth infinity won't actually update the target's
shallow subtrees without this change.
Notes:
The test added in r37169 uses update --set-depth to make subtrees
in a WC shallow, but 1.5.x does not support shallowing of WC depths.
A backport branch can be found at
http://svn.collab.net/repos/svn/branches/1.5.x-r37169 which makes
minor adjustments to the test to work around this limitation. These
adjusments affect *only* the setup of the test.
Votes:
+1: pburba, arfrever, cmpilato
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878305 13f79535-47bb-0310-9956-ffa450edef68
* r37169
Update --set-depth infinity should expand shallow subtrees.
Justification:
update --set-depth infinity won't actually update the target's
shallow subtrees without this change.
Notes:
The test added in r37169 uses update --set-depth to make subtrees
in a WC shallow, but 1.5.x does not support shallowing of WC depths.
A backport branch can be found at
http://svn.collab.net/repos/svn/branches/1.5.x-r37169 which makes
minor adjustments to the test to work around this limitation. These
adjusments affect *only* the setup of the test.
Votes:
+1: pburba, arfrever, cmpilato
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878305 13f79535-47bb-0310-9956-ffa450edef68
Merge r37646, r37656 from trunk:
* r37646, r37656
Fix a segfault in WC to URL copy.
Justification:
Segfaults are always bad.
Notes:
r37646 is the fix, r37656 is a follow up to clear iterpool.
Merging r37646, conflicts in subversion/libsvn_client/copy.c, a backport
branch resolving it can be found here:
http://svn.collab.net/repos/svn/branches/1.5.x-r37646
Votes:
+1: stylesen, arfrever, cmpilato
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878304 13f79535-47bb-0310-9956-ffa450edef68
* r37646, r37656
Fix a segfault in WC to URL copy.
Justification:
Segfaults are always bad.
Notes:
r37646 is the fix, r37656 is a follow up to clear iterpool.
Merging r37646, conflicts in subversion/libsvn_client/copy.c, a backport
branch resolving it can be found here:
http://svn.collab.net/repos/svn/branches/1.5.x-r37646
Votes:
+1: stylesen, arfrever, cmpilato
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878304 13f79535-47bb-0310-9956-ffa450edef68
Cast some post-review votes, since there's some talk of another 1.5.x release.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878220 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878220 13f79535-47bb-0310-9956-ffa450edef68
Simplified Chinese translation update on the '1.5.x' branch:
* subversion/po/zh_CN.po: Backport from trunk.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878212 13f79535-47bb-0310-9956-ffa450edef68
* subversion/po/zh_CN.po: Backport from trunk.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878212 13f79535-47bb-0310-9956-ffa450edef68
On the '1.5.x' branch:
* STATUS: Nominate r38068.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878162 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r38068.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@878162 13f79535-47bb-0310-9956-ffa450edef68
Simplified Chinese translation update on the '1.5.x' branch:
* subversion/po/zh_CN.po: Backport from trunk.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877891 13f79535-47bb-0310-9956-ffa450edef68
* subversion/po/zh_CN.po: Backport from trunk.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877891 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r37779.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877857 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877857 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r37768.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877845 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877845 13f79535-47bb-0310-9956-ffa450edef68
On the '1.5.x' branch:
Follow-up to r37142:
* STATUS: Fix name of the backport branch for r37137.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877834 13f79535-47bb-0310-9956-ffa450edef68
Follow-up to r37142:
* STATUS: Fix name of the backport branch for r37137.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877834 13f79535-47bb-0310-9956-ffa450edef68
Merge r36919 from trunk through 1.5.x-r36919 branch:
* r36919
Fix issue #3250 'Repeated merging of conflicting properties fails'.
Justification:
This issue was introduced in 1.5.x.
Notes:
The merge, conflicts in subversion/libsvn_wc/props.c, a backport branch
resolving it can be found here:
http://svn.collab.net/repos/svn/branches/1.5.x-r36919
Votes:
+1: stylesen, rhuijben, arfrever
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877832 13f79535-47bb-0310-9956-ffa450edef68
* r36919
Fix issue #3250 'Repeated merging of conflicting properties fails'.
Justification:
This issue was introduced in 1.5.x.
Notes:
The merge, conflicts in subversion/libsvn_wc/props.c, a backport branch
resolving it can be found here:
http://svn.collab.net/repos/svn/branches/1.5.x-r36919
Votes:
+1: stylesen, rhuijben, arfrever
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877832 13f79535-47bb-0310-9956-ffa450edef68
Merge r36879 from trunk through 1.5.x-r36879 branch:
* r36879
Fix a merge bug which can occur when the merge target or a subtree of
the target has non-inheritable mergeinfo.
Justification:
I don't know that anyone has encountered this problem in the wild, but
the code is clearly incorrect and r36879 expands an existing merge
test to demonstrate how it could result in incorrect mergeinfo.
Notes:
There are a few minor conflicts in merge_tests.py, a backport branch
resolving these can be found here:
http://svn.collab.net/repos/svn/branches/1.5.x-r36879
Votes:
+1: pburba, rhuijben, arfrever
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877830 13f79535-47bb-0310-9956-ffa450edef68
* r36879
Fix a merge bug which can occur when the merge target or a subtree of
the target has non-inheritable mergeinfo.
Justification:
I don't know that anyone has encountered this problem in the wild, but
the code is clearly incorrect and r36879 expands an existing merge
test to demonstrate how it could result in incorrect mergeinfo.
Notes:
There are a few minor conflicts in merge_tests.py, a backport branch
resolving these can be found here:
http://svn.collab.net/repos/svn/branches/1.5.x-r36879
Votes:
+1: pburba, rhuijben, arfrever
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877830 13f79535-47bb-0310-9956-ffa450edef68
Merge r36613, r36615, r36631, r36641 from trunk through 1.5.x-r36613 branch:
* r36613, r36615, r36631, r36641
Avoid potential segfault when dealing with subtree mergeinfo.
Justification:
One user reported a segfault due to the way, prior to this change, that
we set children_with_mergeinfo elements to NULL rather than removing
the elements from the array, see
http://svn.haxx.se/dev/archive-2009-03/0382.shtml.
Notes:
The fix itself is r36613, r36631, and r36641. r36615 is a variable
renaming change that is necessary to avoid a conflict. r36613 doesn't
merge cleanly due to text conflicts and the lack of SVN_ERR_ASSERT in
1.5.x. A backport branch can be found at
http://svn.collab.net/repos/svn/branches/1.5.x-r36613.
Votes:
+1: pburba, rhuijben, arfrever
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877828 13f79535-47bb-0310-9956-ffa450edef68
* r36613, r36615, r36631, r36641
Avoid potential segfault when dealing with subtree mergeinfo.
Justification:
One user reported a segfault due to the way, prior to this change, that
we set children_with_mergeinfo elements to NULL rather than removing
the elements from the array, see
http://svn.haxx.se/dev/archive-2009-03/0382.shtml.
Notes:
The fix itself is r36613, r36631, and r36641. r36615 is a variable
renaming change that is necessary to avoid a conflict. r36613 doesn't
merge cleanly due to text conflicts and the lack of SVN_ERR_ASSERT in
1.5.x. A backport branch can be found at
http://svn.collab.net/repos/svn/branches/1.5.x-r36613.
Votes:
+1: pburba, rhuijben, arfrever
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877828 13f79535-47bb-0310-9956-ffa450edef68
Follow-up to r37751:
Fix merging conflict which was incorrectly resolved on the backport branch.
* subversion/libsvn_client/merge.c
(get_mergeinfo_paths): Fix call to svn_wc_walk_entries3() to avoid compilation
failure.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877826 13f79535-47bb-0310-9956-ffa450edef68
Fix merging conflict which was incorrectly resolved on the backport branch.
* subversion/libsvn_client/merge.c
(get_mergeinfo_paths): Fix call to svn_wc_walk_entries3() to avoid compilation
failure.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877826 13f79535-47bb-0310-9956-ffa450edef68
Merge r36256 from trunk through 1.5.x-r36256 branch:
* r36256
Fix potentially awful performance of --ignore-ancestry merges.
Justification:
A very simple change which avoids an unneeded walk of the entire merge
target. For large WCs the performance improvement can be dramatic.
See http://svn.haxx.se/dev/archive-2009-03/0067.shtml.
Notes:
There is a minor conflict while merging, so use backport branch
at http://svn.collab.net/repos/svn/branches/1.5.x-r36256.
Votes:
+1: pburba, rhuijben, arfrever
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877825 13f79535-47bb-0310-9956-ffa450edef68
* r36256
Fix potentially awful performance of --ignore-ancestry merges.
Justification:
A very simple change which avoids an unneeded walk of the entire merge
target. For large WCs the performance improvement can be dramatic.
See http://svn.haxx.se/dev/archive-2009-03/0067.shtml.
Notes:
There is a minor conflict while merging, so use backport branch
at http://svn.collab.net/repos/svn/branches/1.5.x-r36256.
Votes:
+1: pburba, rhuijben, arfrever
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877825 13f79535-47bb-0310-9956-ffa450edef68
Merge r36159 from trunk:
* r36159
Fix proxying of LOCK and UNLOCK requests via WebDAV proxies.
Justification:
With the fix, each slave server tries to field the lock/unlock, resulting
in competing ideas of what is and isn't locked.
Votes:
+1: cmpilato, rhuijben, arfrever
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877824 13f79535-47bb-0310-9956-ffa450edef68
* r36159
Fix proxying of LOCK and UNLOCK requests via WebDAV proxies.
Justification:
With the fix, each slave server tries to field the lock/unlock, resulting
in competing ideas of what is and isn't locked.
Votes:
+1: cmpilato, rhuijben, arfrever
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877824 13f79535-47bb-0310-9956-ffa450edef68
Merge r35930 from trunk:
* r35930
Adjust basic_tests.py 12 for compatibility with Windows and Python 2.5+.
Justification:
The mode 'rw+' is invalid with Python 2.5+ on Windows.
Votes:
+1: rhuijben, pburba, arfrever
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877823 13f79535-47bb-0310-9956-ffa450edef68
* r35930
Adjust basic_tests.py 12 for compatibility with Windows and Python 2.5+.
Justification:
The mode 'rw+' is invalid with Python 2.5+ on Windows.
Votes:
+1: rhuijben, pburba, arfrever
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877823 13f79535-47bb-0310-9956-ffa450edef68
On the '1.5.x' branch:
* STATUS: Vote for some revisions.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877747 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Vote for some revisions.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877747 13f79535-47bb-0310-9956-ffa450edef68
On the 1.5.x branch:
* STATUS: Nominate r37646, r37656 group.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877734 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r37646, r37656 group.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877734 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r36527.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877513 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877513 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r37385.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877461 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877461 13f79535-47bb-0310-9956-ffa450edef68
Simplified chinese translation update on the '1.5.x' branch:
* subversion/po/zh_CN.po: Backport from trunk.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877302 13f79535-47bb-0310-9956-ffa450edef68
* subversion/po/zh_CN.po: Backport from trunk.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877302 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r37156.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877277 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877277 13f79535-47bb-0310-9956-ffa450edef68
On the 1.5.x-r37156 branch: Merge r37156 from trunk.
* subversion/tests/cmdline/merge_tests.py
(merge_to_sparse_directories): Don't expect tree conflicts in shallow
children, those are a 1.6.x feature, instead expect skips. Don't do a
dry-run merge either as that only reports to top of the skipped tree,
but the real merge reports the skipped paths within the tree.
* CHANGES
* COMMITTERS
* subversion/libsvn_subr
* subversion/include/private
* src-branch-1.5.x-3
* subversion/bindings/swig
* subversion/libsvn_wc/adm_ops.c
* www/images/subversion-diagram.png
* www/images/subversion_logo-200x173.png
* www/images/subversion_logo-384x332.png
* www/images/subversion_logo_hor-468x64.png
* subversion/tests/cmdline/svntest/actions.py
* notes/tree-conflicts/scratch-pad.txt
Mergeinfo changes.
* subversion/libsvn_client/merge.c
Clean merge.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-r37156@877276 13f79535-47bb-0310-9956-ffa450edef68
* subversion/tests/cmdline/merge_tests.py
(merge_to_sparse_directories): Don't expect tree conflicts in shallow
children, those are a 1.6.x feature, instead expect skips. Don't do a
dry-run merge either as that only reports to top of the skipped tree,
but the real merge reports the skipped paths within the tree.
* CHANGES
* COMMITTERS
* subversion/libsvn_subr
* subversion/include/private
* src-branch-1.5.x-3
* subversion/bindings/swig
* subversion/libsvn_wc/adm_ops.c
* www/images/subversion-diagram.png
* www/images/subversion_logo-200x173.png
* www/images/subversion_logo-384x332.png
* www/images/subversion_logo_hor-468x64.png
* subversion/tests/cmdline/svntest/actions.py
* notes/tree-conflicts/scratch-pad.txt
Mergeinfo changes.
* subversion/libsvn_client/merge.c
Clean merge.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-r37156@877276 13f79535-47bb-0310-9956-ffa450edef68
Create a 1.5.x backport branch for r37156.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-r37156@877275 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-r37156@877275 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r37169.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877274 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877274 13f79535-47bb-0310-9956-ffa450edef68
On the 1.5.x-r37169 branch: Merge r37169 from trunk.
* subversion/tests/cmdline/update_tests.py:
(set_deep_depth_on_target_with_shallow_children): Tweak test's setup to
be 1.5.x compatible.
* CHANGES
* COMMITTERS
* subversion/libsvn_subr
* subversion/include/private
* src-branch-1.5.x-3
* subversion/bindings/swig
* subversion/libsvn_wc/adm_ops.c
* subversion/libsvn_client/merge.c
* www/images/subversion-diagram.png
* www/images/subversion_logo-200x173.png
* www/images/subversion_logo-384x332.png
* www/images/subversion_logo_hor-468x64.png
* subversion/tests/cmdline/svntest/actions.py
* notes/tree-conflicts/scratch-pad.txt
Mergeinfo changes.
* subversion/libsvn_wc/adm_crawler.c
Clean merge.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-r37169@877273 13f79535-47bb-0310-9956-ffa450edef68
* subversion/tests/cmdline/update_tests.py:
(set_deep_depth_on_target_with_shallow_children): Tweak test's setup to
be 1.5.x compatible.
* CHANGES
* COMMITTERS
* subversion/libsvn_subr
* subversion/include/private
* src-branch-1.5.x-3
* subversion/bindings/swig
* subversion/libsvn_wc/adm_ops.c
* subversion/libsvn_client/merge.c
* www/images/subversion-diagram.png
* www/images/subversion_logo-200x173.png
* www/images/subversion_logo-384x332.png
* www/images/subversion_logo_hor-468x64.png
* subversion/tests/cmdline/svntest/actions.py
* notes/tree-conflicts/scratch-pad.txt
Mergeinfo changes.
* subversion/libsvn_wc/adm_crawler.c
Clean merge.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-r37169@877273 13f79535-47bb-0310-9956-ffa450edef68
Create a 1.5.x backport branch for r37169.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-r37169@877272 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-r37169@877272 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Vote for r37117.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877246 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877246 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r37117 and some whitespace fixes.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877233 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877233 13f79535-47bb-0310-9956-ffa450edef68
Propose r37137 for backport to 1.5.x.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877216 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877216 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Note the need for a backport branch on r36851 and friends; add a -0
vote until it happens.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877178 13f79535-47bb-0310-9956-ffa450edef68
vote until it happens.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877178 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Cast another vote and whitespace normalization
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877176 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877176 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Cast some votes
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877173 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877173 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r37072 and r37083.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877172 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@877172 13f79535-47bb-0310-9956-ffa450edef68
* STATUS: Nominate r36919.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@876998 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@876998 13f79535-47bb-0310-9956-ffa450edef68
On the 1.5.x-r36919 branch:
Merge r36919 from trunk, resolving some conflicts in
subversion/libsvn_wc/props.c
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-r36919@876997 13f79535-47bb-0310-9956-ffa450edef68
Merge r36919 from trunk, resolving some conflicts in
subversion/libsvn_wc/props.c
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-r36919@876997 13f79535-47bb-0310-9956-ffa450edef68
Create a 1.5.x backport branch for r36919.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-r36919@876996 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-r36919@876996 13f79535-47bb-0310-9956-ffa450edef68
Merge r36783 from trunk:
* r36783
Dereference a pointer to a svn_revnum_t to check if it's a valid
revision.
Justification:
Thorugh sheer luck it doesn't appear that this can cause any problems,
see http://svn.haxx.se/dev/archive-2009-03/0746.shtml, but it is
clearly wrong.
Votes:
+1: pburba, blair, stylesen
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@876981 13f79535-47bb-0310-9956-ffa450edef68
* r36783
Dereference a pointer to a svn_revnum_t to check if it's a valid
revision.
Justification:
Thorugh sheer luck it doesn't appear that this can cause any problems,
see http://svn.haxx.se/dev/archive-2009-03/0746.shtml, but it is
clearly wrong.
Votes:
+1: pburba, blair, stylesen
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@876981 13f79535-47bb-0310-9956-ffa450edef68
Merge r36860 from trunk:
* r36860
Fix an error leak.
Votes:
+1: danielsh, cmpilato, stylesen
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@876980 13f79535-47bb-0310-9956-ffa450edef68
* r36860
Fix an error leak.
Votes:
+1: danielsh, cmpilato, stylesen
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x@876980 13f79535-47bb-0310-9956-ffa450edef68