Branko Cibej [Fri, 20 Mar 2015 10:30:40 +0000 (20 10:30 +0000)]
* ^/subversion/branches/1.7.x-r1667941: Merge r1667976 to the backport branch.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1667941@1667979 13f79535-47bb-0310-9956-ffa450edef68
Branko Cibej [Fri, 20 Mar 2015 07:18:50 +0000 (20 07:18 +0000)]
Cherry-pick r1667941 from trunk and resolve conflicts.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1667941@1667945 13f79535-47bb-0310-9956-ffa450edef68
Branko Cibej [Fri, 20 Mar 2015 07:16:21 +0000 (20 07:16 +0000)]
Create a 1.7.x backport branch for r1667941.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1667941@1667944 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Thu, 19 Mar 2015 18:23:34 +0000 (19 18:23 +0000)]
* STATUS: Nominate v1.7.x-VS2012-15 branch
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1667831 13f79535-47bb-0310-9956-ffa450edef68
Stefan Sperling [Wed, 18 Mar 2015 16:07:29 +0000 (18 16:07 +0000)]
* CHANGES (1.7.x): Merge all outstanding revisions from trunk. This is a no-op
in terms of file content, but fills gaps in svn:mergeinfo on this file.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1667582 13f79535-47bb-0310-9956-ffa450edef68
Stefan Sperling [Wed, 18 Mar 2015 13:57:45 +0000 (18 13:57 +0000)]
Post-release housekeeping: bump the 1.7.x branch to 1.7.21.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1667557 13f79535-47bb-0310-9956-ffa450edef68
Stefan Sperling [Wed, 18 Mar 2015 10:53:17 +0000 (18 10:53 +0000)]
On the 1.7.x branch: Commit mergeinfo changes which should have been part
of r1667487.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1667490 13f79535-47bb-0310-9956-ffa450edef68
Stefan Sperling [Wed, 18 Mar 2015 10:49:19 +0000 (18 10:49 +0000)]
* CHANGES (1.7.x): Cherry-pick revisions related to 1.7 from trunk/CHANGES.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1667487 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Wed, 18 Mar 2015 04:00:47 +0000 (18 04:00 +0000)]
Merge the 1.7.x-r1644595 branch:
* r1644158, r1644530, r1644595, r1644599, r1652744
Fix patch output for reordered hunks, part of issue 4533.
Justification:
Output is invalid.
Branch:
^/subversion/branches/1.7.x-r1644595
Votes:
+1: philip, stefan2, brane
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1667438 13f79535-47bb-0310-9956-ffa450edef68
Branko Cibej [Tue, 17 Mar 2015 13:34:21 +0000 (17 13:34 +0000)]
* branches/1.7.x/STATUS: Approve r1644158.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1667303 13f79535-47bb-0310-9956-ffa450edef68
Evgeny Kotkov [Tue, 17 Mar 2015 10:37:44 +0000 (17 10:37 +0000)]
Merge r1667235 from trunk:
* r1667235
Reject invalid transaction property change requests.
Justification:
These requests aren't valid and should result in an error.
Votes:
+1: kotkov, philip, ivan
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1667248 13f79535-47bb-0310-9956-ffa450edef68
Evgeny Kotkov [Tue, 17 Mar 2015 10:35:02 +0000 (17 10:35 +0000)]
Merge r1667233 from trunk:
* r1667233
Reject invalid get-location-segments requests in mod_dav_svn / svnserve.
Justification:
These requests aren't valid and should result in an error.
Votes:
+1: kotkov, ivan, philip
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1667246 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Sat, 7 Mar 2015 04:02:11 +0000 (7 04:02 +0000)]
Merge the 1.7.x-buildfix-neon branch:
* ^/subversion/branches/1.7.x-buildfix-neon
Fix building neon when passing an absolute path to gen-make.py
Justification:
Don't create invalid paths in generated project files as those
will just produce unreadable errors.
See http://ci.apache.org/builders/svn-windows-local/builds/1617/steps/Build/logs/stdio
"System.InvalidOperationException: The item metadata "%(FullPath)" cannot be applied
to the path "D:\local\svn-local\build\D:\local\svn-local\deps\build\neon\neon.vcxproj".
The given path's format is not supported."
Branch:
^/subversion/branches/1.7.x-buildfix-neon
Votes:
+1: rhuijben, stefan2, stsp
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1664789 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Sat, 7 Mar 2015 04:01:32 +0000 (7 04:01 +0000)]
Merge the 1.7.x-r1646797 branch:
* r1646785, r1646786, r1646797
Fix a pool handling bug in config variable expansion.
Justification:
Using memory after free is undefined behaviour.
Branch:
^/subversion/branches/1.7.x-r1646797
Votes:
+1: philip, stefan2, stsp
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1664787 13f79535-47bb-0310-9956-ffa450edef68
Stefan Sperling [Fri, 6 Mar 2015 13:42:56 +0000 (6 13:42 +0000)]
* STATUS (for 1.7.x): Vote, approving 2 backports.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1664619 13f79535-47bb-0310-9956-ffa450edef68
Stefan Fuhrmann [Thu, 19 Feb 2015 09:27:39 +0000 (19 09:27 +0000)]
* STATUS: Vote for the neon buildfix.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1660816 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Thu, 19 Feb 2015 04:00:38 +0000 (19 04:00 +0000)]
Merge r1651759 from trunk:
* r1651759
Api correctness fix: Duplicate error filename when copying errors
Justification:
Simple to fix issue caused error on buildbot.
Votes:
+1: rhuijben, philip, stefan2
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1660786 13f79535-47bb-0310-9956-ffa450edef68
Stefan Fuhrmann [Wed, 18 Feb 2015 12:03:27 +0000 (18 12:03 +0000)]
* STATUS: Changing to +1 vote for the r1652182 / issue 4551 group.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1660606 13f79535-47bb-0310-9956-ffa450edef68
Stefan Fuhrmann [Wed, 18 Feb 2015 10:58:28 +0000 (18 10:58 +0000)]
* STATUS: -0 on the r1652182 / issue 4551 group due to build problem.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1660590 13f79535-47bb-0310-9956-ffa450edef68
Stefan Fuhrmann [Wed, 18 Feb 2015 10:52:02 +0000 (18 10:52 +0000)]
* STATUS: Vote for and approve r1651759.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1660588 13f79535-47bb-0310-9956-ffa450edef68
Stefan Fuhrmann [Wed, 18 Feb 2015 10:45:49 +0000 (18 10:45 +0000)]
* STATUS: Vote for r1542765, r1644158 and r1646785 groups.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1660586 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Wed, 18 Feb 2015 08:29:31 +0000 (18 08:29 +0000)]
* STATUS: Nominate very easy to review neon buildfix.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1660571 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Wed, 18 Feb 2015 08:18:53 +0000 (18 08:18 +0000)]
* build/generator/gen_vcnet_vcproj.py
(write): Don't prepend $(SolutionDir) before absolute paths.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-buildfix-neon@1660569 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Wed, 18 Feb 2015 08:15:01 +0000 (18 08:15 +0000)]
Create backport branch for an issue building neon
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-buildfix-neon@1660567 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Wed, 18 Feb 2015 04:00:22 +0000 (18 04:00 +0000)]
Merge the r1544302 group from trunk:
* r1544302, r1544303
Add HTTPd lock file configuration for testing against HTTPd 2.4+.
Justification:
Without this change, the davautocheck tests do not work on some
systems where HTTPd 2.4+ is the default; OSX 10.10 is one such case.
Notes:
As far as I'm concerned, this blocks 1.7.19 and 1.8.11 since the
tests won't run on a current version of a supported OS.
Votes:
+1: brane, breser, philip
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1660561 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Tue, 17 Feb 2015 14:53:00 +0000 (17 14:53 +0000)]
* STATUS: Vote for error memory fix.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1660401 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Tue, 17 Feb 2015 13:54:26 +0000 (17 13:54 +0000)]
* STATUS: Vote/approve davautocheck.sh fix.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1660379 13f79535-47bb-0310-9956-ffa450edef68
Daniel Shahaf [Mon, 16 Feb 2015 02:27:58 +0000 (16 02:27 +0000)]
* STATUS: Vote for part of r1659867.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1660017 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Sun, 15 Feb 2015 18:46:28 +0000 (15 18:46 +0000)]
* STATUS: Nominate r1659867.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1659977 13f79535-47bb-0310-9956-ffa450edef68
Julian Foad [Sat, 14 Feb 2015 11:24:32 +0000 (14 11:24 +0000)]
* STATUS: Veto my own nomination of r1643074 - load with invalid mergeinfo.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1659779 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Fri, 13 Feb 2015 18:56:33 +0000 (13 18:56 +0000)]
* STATUS: Remove my veto on r1643074.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1659646 13f79535-47bb-0310-9956-ffa450edef68
Julian Foad [Fri, 13 Feb 2015 18:32:55 +0000 (13 18:32 +0000)]
* STATUS: Veto my own nomination of issue #4476 - svnsync with r0 mergeinfo.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1659642 13f79535-47bb-0310-9956-ffa450edef68
Stefan Fuhrmann [Thu, 29 Jan 2015 10:56:56 +0000 (29 10:56 +0000)]
* STATUS: Add r1561419 and the issue #4554 group
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1655589 13f79535-47bb-0310-9956-ffa450edef68
Julian Foad [Mon, 26 Jan 2015 14:08:34 +0000 (26 14:08 +0000)]
* STATUS: Propose fixes for issue #4551 "svnrdump load commits wrong properties, or fails, on a non-deltas dumpfile".
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1654808 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Mon, 19 Jan 2015 12:16:48 +0000 (19 12:16 +0000)]
* STATUS: Add r1652744 to patch proposal.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1652980 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Mon, 19 Jan 2015 12:15:30 +0000 (19 12:15 +0000)]
On 1.7.x-r1644595 branch: merge r1652744, the total order fix.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1644595@1652979 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Wed, 14 Jan 2015 18:23:19 +0000 (14 18:23 +0000)]
* STATUS: Nominate r1651759.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1651761 13f79535-47bb-0310-9956-ffa450edef68
Branko Cibej [Sat, 20 Dec 2014 09:51:38 +0000 (20 09:51 +0000)]
* branches/1.7.x/STATUS: Strike two. :)
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1646940 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Fri, 19 Dec 2014 17:56:51 +0000 (19 17:56 +0000)]
* STATUS: Propose config pool fix.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1646809 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Fri, 19 Dec 2014 17:54:31 +0000 (19 17:54 +0000)]
On 1.7.x-r1646797 branch: merge r1646785,
1646786,
1646797, resolve
conflict and adapt regression test to 1.7.x.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1646797@1646808 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Fri, 19 Dec 2014 17:52:32 +0000 (19 17:52 +0000)]
Create backport branch.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1646797@1646806 13f79535-47bb-0310-9956-ffa450edef68
Julian Foad [Wed, 17 Dec 2014 16:20:07 +0000 (17 16:20 +0000)]
* STATUS: Nominate r1646250 group (issue #4476 svnsync with r0 mergeinfo).
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1646286 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Tue, 16 Dec 2014 16:55:08 +0000 (16 16:55 +0000)]
* STATUS: Vote for davautocheck fixes.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1646007 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Mon, 15 Dec 2014 10:14:13 +0000 (15 10:14 +0000)]
* STATUS: Fix typo in branch name.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1645608 13f79535-47bb-0310-9956-ffa450edef68
Branko Cibej [Mon, 15 Dec 2014 02:05:20 +0000 (15 02:05 +0000)]
* STATUS: Propose fix for "make davautocheck" with HTTPd 2.4+.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1645547 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Thu, 11 Dec 2014 17:11:50 +0000 (11 17:11 +0000)]
* STATUS: Propose patch output fix.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1644703 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Thu, 11 Dec 2014 17:03:01 +0000 (11 17:03 +0000)]
On 1.7.x-r1644595 branch: merge the patch output fix for issue 4533
and resolve conflicts in libsvn_client/patch.c and patch_tests.py.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1644595@1644699 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Thu, 11 Dec 2014 16:21:16 +0000 (11 16:21 +0000)]
Create 1.7 backport branch.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1644595@1644692 13f79535-47bb-0310-9956-ffa450edef68
Julian Foad [Wed, 10 Dec 2014 18:11:25 +0000 (10 18:11 +0000)]
* STATUS: Change my veto on r1643074 to +1 having fixed the swig-rb issue.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1644500 13f79535-47bb-0310-9956-ffa450edef68
Julian Foad [Tue, 9 Dec 2014 18:18:09 +0000 (9 18:18 +0000)]
* STATUS: Veto my own backport of r1643074 for now: it still breaks swig-rb.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1644141 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Tue, 9 Dec 2014 09:12:43 +0000 (9 09:12 +0000)]
Post-release housekeeping: bump the 1.7.x branch to 1.7.20.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1644003 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Tue, 9 Dec 2014 07:08:57 +0000 (9 07:08 +0000)]
* STATUS: Veto r1643074
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643993 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Tue, 9 Dec 2014 06:55:44 +0000 (9 06:55 +0000)]
* subversion: Delete useless mergeinfo created by the r1643189 merge.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643991 13f79535-47bb-0310-9956-ffa450edef68
Stefan Fuhrmann [Tue, 9 Dec 2014 05:13:22 +0000 (9 05:13 +0000)]
On the 1.7.x branch: Revert r1643189 because it was an obvious mis-merge
(doubly false: wrong revision merged into the wrong branch).
Manually resolve the svn:mergeinfo conflict on the ./subversion folder.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643986 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Tue, 9 Dec 2014 02:08:35 +0000 (9 02:08 +0000)]
Merge r1643972 from trunk to bring CHANGES up to date.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643974 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Tue, 9 Dec 2014 02:04:07 +0000 (9 02:04 +0000)]
Merge r1643810 from trunk:
* r1643810
Avoid unneeded memory growth in mod_dav resource walking (issue 4531)
Justification:
Some copy operations failed in certain user scenarios, with really huge
trees.
Notes:
This is working around a mod_dav inefficiency in recent 2.2/2.4.
Votes:
+1: rhuijben, stsp, philip
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643971 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Tue, 9 Dec 2014 02:04:05 +0000 (9 02:04 +0000)]
Merge the r1640862 group from trunk:
* r1640862, r1640873, r1643793
Work with libtool 2.4.3
Justification:
libtool 2.4.3 is needed to build properly on OS X 10.10
Votes:
+1: philip, brane, breser
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643970 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Mon, 8 Dec 2014 21:33:54 +0000 (8 21:33 +0000)]
* STATUS: Vote/approve mod_dav copy fix.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643934 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Mon, 8 Dec 2014 17:36:43 +0000 (8 17:36 +0000)]
* STATUS: Extend my vote and approve the libtool fix.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643868 13f79535-47bb-0310-9956-ffa450edef68
Branko Cibej [Mon, 8 Dec 2014 17:26:25 +0000 (8 17:26 +0000)]
* STATUS: Extend my vote to r1643793.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643867 13f79535-47bb-0310-9956-ffa450edef68
Stefan Sperling [Mon, 8 Dec 2014 13:51:57 +0000 (8 13:51 +0000)]
* STATUS (for 1.7.x): Vote for r1643810.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643821 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Mon, 8 Dec 2014 13:19:48 +0000 (8 13:19 +0000)]
* STATUS: Nominate r1643810.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643813 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Mon, 8 Dec 2014 12:12:24 +0000 (8 12:12 +0000)]
* STATUS: Vote for libtool fix with additional proposal.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643796 13f79535-47bb-0310-9956-ffa450edef68
Branko Cibej [Sun, 7 Dec 2014 19:53:45 +0000 (7 19:53 +0000)]
* STATUS: Vote for the libtool 2.4.3 backports for 1.7.x and 1.8.x.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643713 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Sat, 6 Dec 2014 03:18:57 +0000 (6 03:18 +0000)]
* STATUS: Nominate libtool 2.4.3 fix.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643488 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Sat, 6 Dec 2014 02:15:30 +0000 (6 02:15 +0000)]
Merge r1643033 and r1643457 from trunk to bring in 1.7.19 CHANGES entries.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643484 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Fri, 5 Dec 2014 22:07:00 +0000 (5 22:07 +0000)]
Merge r1643437 from trunk:
* r1643437
Correctly reject requests with invalid virtual transaction names.
Justification:
These requests aren't valid and should result in an error.
Votes:
+1: breser, philip, rhuijben, kotkov
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643443 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Fri, 5 Dec 2014 21:57:49 +0000 (5 21:57 +0000)]
Merge r1643409 from trunk:
* r1643409
Correctly reject requests with missing repos paths.
Justification:
These requests aren't valid and should result in an error.
Votes:
+1: breser, philip, rhuijben, kotkov
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643441 13f79535-47bb-0310-9956-ffa450edef68
Julian Foad [Fri, 5 Dec 2014 08:25:52 +0000 (5 08:25 +0000)]
On the '1.7.x-r1643074' branch: merge r1643074 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643189 13f79535-47bb-0310-9956-ffa450edef68
Julian Foad [Fri, 5 Dec 2014 08:25:18 +0000 (5 08:25 +0000)]
* STATUS: Nominate r1643074.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643187 13f79535-47bb-0310-9956-ffa450edef68
Stefan Fuhrmann [Thu, 4 Dec 2014 23:56:58 +0000 (4 23:56 +0000)]
* STATUS: Withdraw r1555491 as it is ineffective.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643133 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Wed, 3 Dec 2014 01:03:15 +0000 (3 01:03 +0000)]
Merge r1637826 from trunk:
* r1637826
Fix typos in LIBTOOL_M4 and LIBTOOL_CONFIG expansion in autogen.sh
Justification:
Makes no sense to tell users to set environment variables
to fix builds with libtool in a nonstandard location, if we
then don't interpret said environment variables correctly.
Votes:
+1: brane, stefan2, breser
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643032 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Wed, 3 Dec 2014 01:03:14 +0000 (3 01:03 +0000)]
Merge r1595431 from trunk:
* r1595431
Use a proper intermediate directory when building with VS 2003-2008.
Justification:
Reported as a build problem by some of our usual dist signers.
Votes:
+1: rhuijben, stefan2, breser
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643031 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Wed, 3 Dec 2014 01:02:54 +0000 (3 01:02 +0000)]
Merge the 1.7.x-r1594157 branch:
* r1594156
Fix a problem with the Unix build that could result in linking to the wrong
Subversion libraries at build time or at run time.
Justification:
Building and testing should Just Work as far as possible.
Branch:
^/subversion/branches/1.7.x-r1594157
Votes:
+1: julianfoad, stefan2, breser
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643029 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Wed, 3 Dec 2014 01:02:34 +0000 (3 01:02 +0000)]
Merge the 1.7.x-r1227815-conflict branch:
* ^/subversion/branches/1.7.x-r1227815-conflict
Fix compilation after backporting 1.7.x-r1574868 branch.
Justification:
1.7.x shouldn't cause compile errors.
Branch:
^/subversion/branches/1.7.x-r1227815-conflict
Votes:
+1: rhuijben, julianfoad, philip
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643027 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Tue, 2 Dec 2014 22:52:09 +0000 (2 22:52 +0000)]
* STATUS: Vote and approve some changes.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1643020 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Tue, 2 Dec 2014 11:11:40 +0000 (2 11:11 +0000)]
* STATUS: Vote/approve backport conflict fix.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1642843 13f79535-47bb-0310-9956-ffa450edef68
Julian Foad [Mon, 1 Dec 2014 13:59:02 +0000 (1 13:59 +0000)]
* STATUS: Vote for branches/1.7.x-r1227815-conflict.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1642684 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Mon, 1 Dec 2014 10:52:46 +0000 (1 10:52 +0000)]
* STATUS: Nominate patch to resolve compile error
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1642664 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Mon, 1 Dec 2014 10:50:06 +0000 (1 10:50 +0000)]
Fix compile error on 1.7.x caused by the 1.7.x-r1574868 backport.
* subversion/libsvn_repos/dump.c
(dump_node): Use baton value as boolean as dump_node as r1227815 didn't
change the baton on this branch to the 1.8.x+ style.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1227815-conflict@1642663 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Mon, 1 Dec 2014 10:47:27 +0000 (1 10:47 +0000)]
Create backport branch for compile error caused by r1227815 differences
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1227815-conflict@1642662 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Mon, 1 Dec 2014 04:00:59 +0000 (1 04:00 +0000)]
Merge the 1.7.x-r1641564 branch:
* r1641564
Fix issue 4185: file external not following history.
Justification:
Checkout/update fails, regression from 1.6.
Notes:
Failure was silent, notification occurred but file was not present in wc.
Branch:
^/subversion/branches/1.7.x-r1641564
Votes:
+1: philip, rhuijben, stefan2
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1642631 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Mon, 1 Dec 2014 04:00:40 +0000 (1 04:00 +0000)]
Merge the 1.7.x-r1574868 branch:
* r1574868
Don't let invalid mergeinfo stop 'svnadmin dump' from producing a dump.
Part of issue #4476 "Mergeinfo containing r0 makes svnsync and svnadmin
dump fail".
Justification:
A formatting error in what is essentially client-side metadata, albeit
with repository-side interpretation as well, should never prevent
dumping the repository. This issue only occurs when svnadmin is trying
to warn us of mergeinfo revisions that might be unexpected, so it is
not essential.
Notes:
There is a work-around, at least in theory: a dump starting from
revision 0 or 1 does not suffer from this problem.
Branch:
^/subversion/branches/1.7.x-r1574868
Votes:
+1: julianfoad, rhuijben, stefan2
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1642629 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Mon, 1 Dec 2014 04:00:34 +0000 (1 04:00 +0000)]
Merge the r1542610 group from trunk:
* r1542610, r1564576, r1568180
Add missing description to build.conf, to properly generate a version
resource (including icon) for this executable on Windows.
Votes:
+1: rhuijben, breser, stefan2
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1642628 13f79535-47bb-0310-9956-ffa450edef68
Stefan Fuhrmann [Sun, 30 Nov 2014 19:57:47 +0000 (30 19:57 +0000)]
* STATUS:
Vote for r1594156.
Vote for r1595431.
Vote for r1637826.
Vote for and approve r1542610 group.
Vote for and approve r1574868.
Vote for and approve r1641564.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1642601 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Thu, 27 Nov 2014 04:00:36 +0000 (27 04:00 +0000)]
Merge the r1386594 group from trunk:
* r1386594,
1386601,
1640730
Use sync Gnome Keyring API as our use of the async is not thread safe.
Justification:
Fix issue 3498: eclipse IDE crashes.
Notes:
r1640730 is the fix, r1386594 and r1386601 to avoid conflict.
Votes:
+1: philip, markphip
+1: rhuijben (unable to test, but fix looks sane and simplifies code)
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1642023 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Wed, 26 Nov 2014 15:48:19 +0000 (26 15:48 +0000)]
* STATUS: Cast vote. Approve r1640730 group.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1641839 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Tue, 25 Nov 2014 11:52:25 +0000 (25 11:52 +0000)]
* STATUS: Cast vote.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1641595 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Tue, 25 Nov 2014 11:27:02 +0000 (25 11:27 +0000)]
* STATUS: Propose issue 4185 fix.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1641580 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Tue, 25 Nov 2014 11:24:07 +0000 (25 11:24 +0000)]
Merge r1641564 and drop change to externals_tests.py as the
modified test is not on the branch.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1641564@1641578 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Tue, 25 Nov 2014 11:15:34 +0000 (25 11:15 +0000)]
Create 1.7 backport branch for r1641564.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1641564@1641574 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Sat, 22 Nov 2014 04:00:41 +0000 (22 04:00 +0000)]
Merge the 1.7.x-r1462041 branch:
* r1462041
Fix issue issue 4339, diff suffix scanning invalid read at last chunk
boundary.
Justification:
Without this patch we access memory that isn't part of the diff, which
in some cases causes a segfault.
Notes:
This branch only merges the actual fix. Trunk and 1.8.x have a test
for this case.
Branch:
^/subversion/branches/1.7.x-r1462041
Votes:
+1: rhuijben, stsp, philip
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1641029 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Sat, 22 Nov 2014 04:00:37 +0000 (22 04:00 +0000)]
Merge r1591123 from trunk:
* r1591123
Display the proper URL for 'svn rm URL' in the commit log editor.
Justification:
It's confusing since the URL isn't what the user passed. Regression since
1.7.9 when we fixed issue #4332.
Votes:
+1: breser, rhuijben, julianfoad
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1641028 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Fri, 21 Nov 2014 16:12:48 +0000 (21 16:12 +0000)]
* STATUS: Vote/approve diff suffix fix.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1640950 13f79535-47bb-0310-9956-ffa450edef68
Julian Foad [Fri, 21 Nov 2014 13:01:58 +0000 (21 13:01 +0000)]
* STATUS: Vote and approve r1591123: display proper URL for 'svn rm URL'.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1640911 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Thu, 20 Nov 2014 17:38:33 +0000 (20 17:38 +0000)]
* STATUS: Propose keyring fix.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1640771 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Wed, 19 Nov 2014 04:00:20 +0000 (19 04:00 +0000)]
Merge r1636874 from trunk:
* r1636874
Provide @since information in svn_stream_skip docstring.
Justification:
Our API docs should be accurate.
Votes:
+1: stefan2, julianfoad
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1640478 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Tue, 18 Nov 2014 23:18:25 +0000 (18 23:18 +0000)]
* STATUS: Cast a vote.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1640455 13f79535-47bb-0310-9956-ffa450edef68
Julian Foad [Tue, 18 Nov 2014 16:46:00 +0000 (18 16:46 +0000)]
* STATUS: Approve a documentation fix (which doesn't need voting).
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1640387 13f79535-47bb-0310-9956-ffa450edef68
Branko Cibej [Mon, 10 Nov 2014 12:33:15 +0000 (10 12:33 +0000)]
branches/1.7.x/STATUS: Propose r1637826.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1637829 13f79535-47bb-0310-9956-ffa450edef68