Ben Reser [Wed, 6 Mar 2013 06:08:10 +0000 (6 06:08 +0000)]
Solaris does not support the gssapi library option to krb5-config, however
it does have a gssapi implementation. Requiring us to look for the library
in a well known path.
This is being put on a branch since trunk no longer has gssapi detection
support since it has been moved into serf.
* build/ac-macros/gssapi.m4:
(SVN_LIB_RA_SERF_GSSAPI): Detect when krb5-config --libs gssapi fails and
try with krb5-config --libs krb5 and then use -lgss and
-I/usr/include/gssapi.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-gssapi-solaris10@1453166 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Wed, 6 Mar 2013 05:57:25 +0000 (6 05:57 +0000)]
Create branch to hold fixes for Kerberos/GSSAPI detection on Solaris10 on 1.7.x.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-gssapi-solaris10@1453164 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Wed, 6 Mar 2013 05:55:13 +0000 (6 05:55 +0000)]
* STATUS: Add r1452617 to r1451678 and improve the description.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1453163 13f79535-47bb-0310-9956-ffa450edef68
Stefan Sperling [Tue, 5 Mar 2013 12:58:47 +0000 (5 12:58 +0000)]
* STATUS: Nominate r1452780.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1452781 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Fri, 1 Mar 2013 18:48:18 +0000 (1 18:48 +0000)]
* STATUS: Nominate r1451678 for 1.7.x.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1451685 13f79535-47bb-0310-9956-ffa450edef68
Stefan Sperling [Wed, 13 Feb 2013 17:17:13 +0000 (13 17:17 +0000)]
* STATUS: Nominate issue #3741 fix.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1445759 13f79535-47bb-0310-9956-ffa450edef68
Ivan Zhakov [Fri, 8 Feb 2013 11:38:39 +0000 (8 11:38 +0000)]
* STATUS: Vote for r1443929.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1443946 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Fri, 8 Feb 2013 11:00:36 +0000 (8 11:00 +0000)]
* STATUS: Propose r1443929.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1443933 13f79535-47bb-0310-9956-ffa450edef68
Paul Burba [Mon, 4 Feb 2013 21:21:33 +0000 (4 21:21 +0000)]
* STATUS: Add r1441810 to the issue #4306 group.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1442368 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Sat, 2 Feb 2013 04:03:13 +0000 (2 04:03 +0000)]
Merge r1435361 from trunk:
* r1435361
JavaHL status API does not respect the ignoreExternals boolean.
Justification:
The API does not work properly and the fix was obvious.
Votes:
+1: markphip, rhuijben
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1441698 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Fri, 1 Feb 2013 09:21:49 +0000 (1 09:21 +0000)]
* STATUS: Fix indentation
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1441353 13f79535-47bb-0310-9956-ffa450edef68
Mark Phippard [Thu, 31 Jan 2013 18:56:00 +0000 (31 18:56 +0000)]
* STATUS: Move r1435361 to approved section
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1441120 13f79535-47bb-0310-9956-ffa450edef68
C. Michael Pilato [Wed, 30 Jan 2013 19:51:12 +0000 (30 19:51 +0000)]
* STATUS
Propose the 1.7.x-neon-properr branch for 1.7.x integration.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1440621 13f79535-47bb-0310-9956-ffa450edef68
Paul Burba [Sun, 27 Jan 2013 03:44:56 +0000 (27 03:44 +0000)]
* STATUS: Vote for issue #4306 group.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1439016 13f79535-47bb-0310-9956-ffa450edef68
Stefan Sperling [Sat, 26 Jan 2013 11:55:55 +0000 (26 11:55 +0000)]
* STATUS: Nominate r1438879.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1438884 13f79535-47bb-0310-9956-ffa450edef68
Stefan Sperling [Sat, 26 Jan 2013 10:35:56 +0000 (26 10:35 +0000)]
* STATUS: Nominate issue #4306 fix.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1438874 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Sat, 19 Jan 2013 22:28:08 +0000 (19 22:28 +0000)]
* STATUS: Nominate issue #4295 fix for backporting. Cast vote
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1435742 13f79535-47bb-0310-9956-ffa450edef68
Mark Phippard [Fri, 18 Jan 2013 21:52:15 +0000 (18 21:52 +0000)]
* STATUS: Nominate r1435361
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1435363 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Fri, 18 Jan 2013 04:02:19 +0000 (18 04:02 +0000)]
Reintegrate the 1.7.x-r1352031 branch:
* r1352031
Change get-deps.sh to use zlib 1.2.7.
Justification:
1.2.5 is no longer available for download at the URL get-deps.sh tries.
This prevents get-deps.sh from failling.
Notes:
The branch is needed since get-deps.sh has removed neon on trunk which
causes conflicts.
Branch:
^/subversion/branches/1.7.x-r1352031
Votes:
+1: breser, brane, rhuijben
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1435018 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Thu, 17 Jan 2013 17:16:00 +0000 (17 17:16 +0000)]
* STATUS: Nominate r1434750
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1434787 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Thu, 17 Jan 2013 06:19:41 +0000 (17 06:19 +0000)]
* STATUS: Fix indentation on r1352031 so svn-role can merge it.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1434563 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Thu, 17 Jan 2013 04:02:15 +0000 (17 04:02 +0000)]
Reintegrate the 1.7.x-issue4263 branch:
* ^/subversion/branches/1.7.x-issue4263
Fix svnrdump inability to load dump files with non-LF line endings in
'svn:*' properties.
Justification:
Other tools have had this issue resolved, svnrdump should as well.
Branch:
^/subversion/branches/1.7.x-issue4263
Votes:
+1: breser, danielsh, rhuijben
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1434548 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Thu, 17 Jan 2013 00:25:38 +0000 (17 00:25 +0000)]
* STATUS: Cast vote
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1434517 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Thu, 17 Jan 2013 00:24:10 +0000 (17 00:24 +0000)]
* STATUS: Nominate issue #4034 fix
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1434516 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Wed, 16 Jan 2013 21:51:04 +0000 (16 21:51 +0000)]
* STATUS: Add Issue #4294 as a 1.7.x backport candidate.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1434426 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Wed, 16 Jan 2013 08:24:43 +0000 (16 08:24 +0000)]
* STATUS: Cast some votes, approve 2 groups
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1433850 13f79535-47bb-0310-9956-ffa450edef68
Johan Corveleyn [Wed, 16 Jan 2013 00:12:00 +0000 (16 00:12 +0000)]
* STATUS: Note that the r1426752, r1426762 and r1427278 backports will
probably conflict with one another because they all add a test to
diff-diff3-test.c (specifically, adding lines to the end of its testlist).
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1433758 13f79535-47bb-0310-9956-ffa450edef68
Johan Corveleyn [Tue, 15 Jan 2013 23:55:50 +0000 (15 23:55 +0000)]
* STATUS: Nominate r1427197, r1427210 (fixes for issue#4270
'diff -cN shows wrong line changed') for 1.7.x.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1433749 13f79535-47bb-0310-9956-ffa450edef68
Johan Corveleyn [Tue, 15 Jan 2013 23:16:31 +0000 (15 23:16 +0000)]
* STATUS: Nominate r1427278 for 1.7.x
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1433732 13f79535-47bb-0310-9956-ffa450edef68
Stefan Sperling [Tue, 15 Jan 2013 20:28:17 +0000 (15 20:28 +0000)]
* STATUS: Make the r1306275 nomination description sound less intimidating.
It really deserves review and votes and has already missed several releases.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1433616 13f79535-47bb-0310-9956-ffa450edef68
Johan Corveleyn [Fri, 11 Jan 2013 00:06:53 +0000 (11 00:06 +0000)]
* STATUS: Cast votes on r1426752 and r1426762 (diff-related fixes).
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1431748 13f79535-47bb-0310-9956-ffa450edef68
Branko Cibej [Thu, 10 Jan 2013 23:30:17 +0000 (10 23:30 +0000)]
* branches/1.7.x/STATUS: Vote for r1352031.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1431730 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Thu, 10 Jan 2013 23:26:16 +0000 (10 23:26 +0000)]
* STATUS: Nominate r1352031 for 1.7.x
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1431729 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Thu, 10 Jan 2013 23:22:37 +0000 (10 23:22 +0000)]
Merge r1352031 to 1.7.x-r1352031 branch while dealing with the conflict.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1352031@1431727 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Thu, 10 Jan 2013 23:19:48 +0000 (10 23:19 +0000)]
Make branch for merging r1352031 to 1.7.x
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1352031@1431725 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Sat, 5 Jan 2013 05:17:19 +0000 (5 05:17 +0000)]
Merge r1429201, fix to doc indexing from trunk to 1.7.x via obvious rule.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1429203 13f79535-47bb-0310-9956-ffa450edef68
Hyrum Kurt Wright [Fri, 4 Jan 2013 03:05:28 +0000 (4 03:05 +0000)]
Spiritually merge r1428706 from trunk, under the obvious fix rule.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1428707 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Sat, 29 Dec 2012 20:56:43 +0000 (29 20:56 +0000)]
* STATUS: Nominate r1426830
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1426831 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Sat, 29 Dec 2012 14:00:20 +0000 (29 14:00 +0000)]
* STATUS: Tweak description and nominate r1426762
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1426765 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Sat, 29 Dec 2012 12:39:33 +0000 (29 12:39 +0000)]
* STATUS: Nominate r1426752.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1426754 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Thu, 27 Dec 2012 07:36:16 +0000 (27 07:36 +0000)]
Merge r1426138 which is an obvious typo fix of CHANGES to 1.7.x branch.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1426139 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Sat, 22 Dec 2012 23:38:08 +0000 (22 23:38 +0000)]
* STATUS: Update r1425368 justification
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1425371 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Sat, 22 Dec 2012 23:12:51 +0000 (22 23:12 +0000)]
* STATUS: Nominate r1425368.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1425369 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Sat, 22 Dec 2012 04:00:33 +0000 (22 04:00 +0000)]
Merge r1422053 from trunk:
* r1422053
Remove .swig_checked from tarball.
Justification:
Unnecessary file in tarballs.
Votes:
+1: breser, rhuijben, danielsh
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1425240 13f79535-47bb-0310-9956-ffa450edef68
Daniel Shahaf [Fri, 21 Dec 2012 15:43:41 +0000 (21 15:43 +0000)]
* STATUS: r1421541 += r1424977
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1424980 13f79535-47bb-0310-9956-ffa450edef68
Daniel Shahaf [Fri, 21 Dec 2012 10:31:19 +0000 (21 10:31 +0000)]
* STATUS: Vote, and reply to Bert's questions
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1424853 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Thu, 20 Dec 2012 04:00:49 +0000 (20 04:00 +0000)]
Merge r1422100 from trunk:
* r1422100
Delay storing handle to fix assert when rep-cache is inaccessible.
Justification:
It's an assert.
Votes:
+1: philip, danielsh, rhuijben
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1424285 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Thu, 20 Dec 2012 04:00:30 +0000 (20 04:00 +0000)]
Reintegrate the 1.7.x-r1423646 branch:
* ^/subversion/branches/1.7.x-r1423646
Work around http://www.freebsd.org/cgi/query-pr.cgi?pr=174521 .
Justification:
Small fix, avoids cryptic error message, works elsewhere.
Branch:
^/subversion/branches/1.7.x-r1423646
Votes:
+1: danielsh, arfrever, rhuijben
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1424283 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Wed, 19 Dec 2012 13:02:58 +0000 (19 13:02 +0000)]
* STATUS: Use our default format for r1422100
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1423850 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Wed, 19 Dec 2012 13:02:12 +0000 (19 13:02 +0000)]
* STATUS: Cast some votes, nominate r1423840 group and approve others.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1423849 13f79535-47bb-0310-9956-ffa450edef68
Daniel Shahaf [Tue, 18 Dec 2012 21:19:23 +0000 (18 21:19 +0000)]
* STATUS (r1423646): Add arfrever's vote via IRC.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1423665 13f79535-47bb-0310-9956-ffa450edef68
Daniel Shahaf [Tue, 18 Dec 2012 21:16:30 +0000 (18 21:16 +0000)]
Nominate r1423646.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1423656 13f79535-47bb-0310-9956-ffa450edef68
Daniel Shahaf [Tue, 18 Dec 2012 21:14:29 +0000 (18 21:14 +0000)]
On the r1423646 backport branch, manually apply the get-deps.sh part, and
record-only merge r1423646.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1423646@1423654 13f79535-47bb-0310-9956-ffa450edef68
Daniel Shahaf [Tue, 18 Dec 2012 21:11:24 +0000 (18 21:11 +0000)]
Create r1423646 backport branch.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1423646@1423647 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Tue, 18 Dec 2012 20:50:33 +0000 (18 20:50 +0000)]
* STATUS: Nominate fix for issue 4263 for 1.7.x backport.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1423638 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Tue, 18 Dec 2012 19:34:52 +0000 (18 19:34 +0000)]
On '1.7.x-issue4263' branch: Merge r1423585 from trunk.
Clean merge.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4263@1423594 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Tue, 18 Dec 2012 19:33:19 +0000 (18 19:33 +0000)]
On '1.7.x-issue4263' branch: Merge r1421011 from trunk.
Resolved a minor conflict with some tests have Skip markers for ra_serf.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4263@1423593 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Tue, 18 Dec 2012 19:28:22 +0000 (18 19:28 +0000)]
Create 1.7.x backport branch for issue 4263.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4263@1423588 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Fri, 14 Dec 2012 23:19:47 +0000 (14 23:19 +0000)]
* STATUS: Propose r1422100 (danielsh via IRC).
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1422142 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Fri, 14 Dec 2012 19:27:24 +0000 (14 19:27 +0000)]
* STATUS: Nominate r1422053.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1422055 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Fri, 14 Dec 2012 04:02:58 +0000 (14 04:02 +0000)]
Merge r1421103 from trunk:
* r1421103
Fix segfault with kwallet support.
Justification:
Users may get segfaults when using the kwallet support since the pool
cleanup is setup wrong.
Votes:
+1: breser, rhuijben, danielsh
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1421660 13f79535-47bb-0310-9956-ffa450edef68
Daniel Shahaf [Thu, 13 Dec 2012 21:22:08 +0000 (13 21:22 +0000)]
Nominate r1421541.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1421544 13f79535-47bb-0310-9956-ffa450edef68
Daniel Shahaf [Thu, 13 Dec 2012 17:46:21 +0000 (13 17:46 +0000)]
Approve r1421103.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1421406 13f79535-47bb-0310-9956-ffa450edef68
Daniel Shahaf [Thu, 13 Dec 2012 16:51:06 +0000 (13 16:51 +0000)]
Nominate r1421380.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1421381 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Thu, 13 Dec 2012 09:03:49 +0000 (13 09:03 +0000)]
* STATUS: Cast vote.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1421149 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Thu, 13 Dec 2012 07:43:57 +0000 (13 07:43 +0000)]
* STATUS: Nominate r1421103
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1421106 13f79535-47bb-0310-9956-ffa450edef68
Daniel Shahaf [Tue, 11 Dec 2012 00:11:43 +0000 (11 00:11 +0000)]
* STATUS: Bump 1.7.x branch to 1.7.9
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1419942 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Mon, 10 Dec 2012 22:45:29 +0000 (10 22:45 +0000)]
* subversion/include/svn_version.h: Bump 1.7.x branch to 1.7.9
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1419852 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Mon, 10 Dec 2012 19:30:57 +0000 (10 19:30 +0000)]
Merge CHANGES for 1.7.8 onto 1.7.x branch.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1419691 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Mon, 10 Dec 2012 19:06:19 +0000 (10 19:06 +0000)]
Merge
1409939 onto 1.7.x simple (obvious) formatting change from trunk.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1419671 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Mon, 10 Dec 2012 17:56:17 +0000 (10 17:56 +0000)]
Merge issue #4091 changes from trunk.
* r1295418, r1407131, r1407812, r1408650
Properly handle incoming changes on symlinks (issue #4091)
Justification:
Regression since 1.6.x. Users get unexpected tree conflicts
and assertions.
Notes:
The backport branch contains some testsuite plumbing to allow running
the test to run on operating systems where we don't support symlinks.
Branch:
^/subversion/branches/1.7.x-r1407131/
Votes:
+1: philip, rhuijben, breser
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1419609 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Mon, 10 Dec 2012 17:50:52 +0000 (10 17:50 +0000)]
* STATUS: Vote for issue #4091 and move it to Approved.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1419607 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Mon, 10 Dec 2012 11:46:58 +0000 (10 11:46 +0000)]
* STATUS: Upgrade my vote to include the backport branch fixes
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1419355 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Mon, 10 Dec 2012 11:29:46 +0000 (10 11:29 +0000)]
* STATUS: vote for issue 4091 fix.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1419349 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Mon, 10 Dec 2012 11:26:13 +0000 (10 11:26 +0000)]
On 1.7.x-r1407131 branch. Merge r1295418 to make the new test
run, tweak the backport to make the new test PASS.
* subversion/libsvn_wc/update_editor.c
(change_file_prop): Change conflict action in check.
* subversion/tests/cmdline/svntest/sandbox.py
(simple_append): New.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1407131@1419347 13f79535-47bb-0310-9956-ffa450edef68
Daniel Shahaf [Sat, 8 Dec 2012 23:02:28 +0000 (8 23:02 +0000)]
* STATUS: Withdraw a nomination, with Bert's +1 on dev@.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1418780 13f79535-47bb-0310-9956-ffa450edef68
Daniel Shahaf [Sat, 8 Dec 2012 21:00:24 +0000 (8 21:00 +0000)]
* STATUS: Withdraw vote on an svnmucc nomination.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1418753 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Fri, 7 Dec 2012 04:02:33 +0000 (7 04:02 +0000)]
Merge the r1403588 group from trunk:
* r1403588, r1403691
Expand the scope of mod_dav_svn's validation of client-reported
and client-requested revisions during update operations.
Justifications:
mod_dav_svn should gracefully complain about revisions > HEAD
in the update report all the time, not only when doing an
update operation that doesn't explicitly request a target
revision.
Votes:
+1: cmpilato, rhuijben, brane
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1418182 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Thu, 6 Dec 2012 04:02:28 +0000 (6 04:02 +0000)]
Merge r1409146 from trunk:
* r1409146
Make sure svn_uri_get_file_url_from_dirent() returns a canonical url for
Windows drive roots.
Justification:
Handles a Windows specific corner case in a generic conversion function.
Votes:
+1: rhuijben, stefan2, pburba
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1417733 13f79535-47bb-0310-9956-ffa450edef68
Paul Burba [Wed, 5 Dec 2012 18:16:19 +0000 (5 18:16 +0000)]
* STATUS: Vote -0 for the r1408632 group, noting text conflicts.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1417562 13f79535-47bb-0310-9956-ffa450edef68
Stefan Sperling [Wed, 5 Dec 2012 18:03:25 +0000 (5 18:03 +0000)]
On the 1.7.x branch, merge r1407597 from trunk, as described below,
except I chose not to use --ignore-ancestry and hence didn't need to
perform the --record-only merge.
* r1407597
Fix issue #4079 ("svnmucc cp rev arg" SEGV).
Justification:
"Segmentation fault (core dumped)" is considered sub-par error reporting.
Notes:
svnmucc.c has been renamed since 1.7.x, so backporting this change should
be done like so:
$ svn merge --ignore-ancestry -
c1407597 \
^/subversion/trunk/subversion/svnmucc/svnmucc.c \
tools/client-side/svnmucc/svnmucc.c
$ svn merge --record-only -
c1407597 ^/subversion/trunk
$ svn ci -m ...
Votes:
+1: cmpilato, danielsh, rhuijben
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1417561 13f79535-47bb-0310-9956-ffa450edef68
Stefan Sperling [Wed, 5 Dec 2012 17:54:40 +0000 (5 17:54 +0000)]
* STATUS: Retract r1341060 nomination.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1417558 13f79535-47bb-0310-9956-ffa450edef68
Paul Burba [Wed, 5 Dec 2012 17:53:08 +0000 (5 17:53 +0000)]
* STATUS: Vote and approve r1409146.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1417557 13f79535-47bb-0310-9956-ffa450edef68
Branko Cibej [Wed, 5 Dec 2012 13:07:22 +0000 (5 13:07 +0000)]
* branches/1.7.x/STATUS: Approve r1403588 + r1403691.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1417404 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Tue, 4 Dec 2012 10:55:01 +0000 (4 10:55 +0000)]
* STATUS: Note problems.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1416876 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Tue, 4 Dec 2012 04:02:25 +0000 (4 04:02 +0000)]
Merge r1345740 from trunk:
* r1345740
Remove a cast that is both ugly, and apparently illegal in g++ 4.7.
Justification:
Fails to build.
Votes:
+1: philip, rhuijben, stefan2
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1416767 13f79535-47bb-0310-9956-ffa450edef68
Stefan Fuhrmann [Mon, 3 Dec 2012 15:49:43 +0000 (3 15:49 +0000)]
* STATUS: vote for r1409146; approve r1345740
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1416567 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Mon, 3 Dec 2012 12:46:08 +0000 (3 12:46 +0000)]
* STATUS: Cast some votes, approving r1407597 which the bot can't merge.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1416494 13f79535-47bb-0310-9956-ffa450edef68
svn-role [Wed, 21 Nov 2012 04:02:07 +0000 (21 04:02 +0000)]
Merge the r1403964 group from trunk:
* r1403964, r1403982, r1410106, r1410203
Make fs_fs properly cleanup after a failed transmission of a representation.
Justification:
Read errors can create problems for users of the WANdisco replicator
which does retry requests. Can result in garbage representations in the
rev file.
Also, can cause false-positive "A previous representation is being written
by this process" errors.
Votes:
+1: breser, danielsh, philip
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1411984 13f79535-47bb-0310-9956-ffa450edef68
Philip Martin [Tue, 20 Nov 2012 13:48:03 +0000 (20 13:48 +0000)]
* STATUS: Vote/approve FSFS rep_write_cleanup.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1411660 13f79535-47bb-0310-9956-ffa450edef68
Daniel Shahaf [Sat, 17 Nov 2012 04:13:25 +0000 (17 04:13 +0000)]
Vote for the rep_write_cleanup() group, with thanks to Ben for the background.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1410695 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Sat, 17 Nov 2012 00:01:05 +0000 (17 00:01 +0000)]
* STATUS: Add r1410203 to the rep_write_cleanup proposal.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1410634 13f79535-47bb-0310-9956-ffa450edef68
Ben Reser [Thu, 15 Nov 2012 23:36:35 +0000 (15 23:36 +0000)]
* STATUS: Add r1410106 to r1403964 & r1403982 proposal.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1410110 13f79535-47bb-0310-9956-ffa450edef68
Daniel Shahaf [Thu, 15 Nov 2012 14:27:11 +0000 (15 14:27 +0000)]
Nominate r1409804.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1409805 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Wed, 14 Nov 2012 10:58:30 +0000 (14 10:58 +0000)]
* STATUS: Nominate r1409146
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1409149 13f79535-47bb-0310-9956-ffa450edef68
Daniel Shahaf [Tue, 13 Nov 2012 12:00:34 +0000 (13 12:00 +0000)]
Extend nomination.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1408687 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Tue, 13 Nov 2012 09:41:35 +0000 (13 09:41 +0000)]
* STATUS: Nominate r1407131 group, cast some votes and fix a typo.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1408654 13f79535-47bb-0310-9956-ffa450edef68
Bert Huijben [Tue, 13 Nov 2012 09:34:21 +0000 (13 09:34 +0000)]
Merge r1407812,r1408650 to fix some issues found by the buildbots
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1407131@1408652 13f79535-47bb-0310-9956-ffa450edef68
Daniel Shahaf [Tue, 13 Nov 2012 09:28:02 +0000 (13 09:28 +0000)]
* STATUS (r1408632): Add r1408647.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1408648 13f79535-47bb-0310-9956-ffa450edef68
Daniel Shahaf [Tue, 13 Nov 2012 08:23:45 +0000 (13 08:23 +0000)]
Vote for r1407597.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1408634 13f79535-47bb-0310-9956-ffa450edef68