Author: philip
Date: Thu Oct 20 07:55:27 2011
New Revision: 1186652
URL: http://svn.apache.org/viewvc?rev=1186652view=rev
Log:
Create branch to backport issue 4032 to 1.7.x.
Added:
subversion/branches/1.7.x-issue4032/1.7.x/ (props changed)
- copied from r1186651,
Author: philip
Date: Thu Oct 20 08:12:08 2011
New Revision: 1186659
URL: http://svn.apache.org/viewvc?rev=1186659view=rev
Log:
On 1.7.x-issue4032 branch: merge r1182771 and resolve conflicts in mergeinfo.c.
Modified:
subversion/branches/1.7.x/ (props changed)
Author: philip
Date: Thu Oct 20 08:15:16 2011
New Revision: 1186661
URL: http://svn.apache.org/viewvc?rev=1186661view=rev
Log:
Revert r1186659 which was accidentally committed to the 1.7.x
branch instead of a backport branch.
Modified:
subversion/branches/1.7.x/ (props changed)
Author: philip
Revision: 1186659
Modified property: svn:log
Modified: svn:log at Thu Oct 20 08:17:12 2011
--
--- svn:log (original)
+++ svn:log Thu Oct 20 08:17:12 2011
@@ -1 +1,4 @@
-On 1.7.x-issue4032 branch: merge
Author: philip
Date: Thu Oct 20 08:22:35 2011
New Revision: 1186665
URL: http://svn.apache.org/viewvc?rev=1186665view=rev
Log:
Merge r1152189-1152190 to 1.7.x-r1152189 and resolve conflicts.
* r1152189, r1152190
Fix an assertion on copying nodes that are not presence normal.
Removed:
Author: philip
Revision: 1186665
Modified property: svn:log
Modified: svn:log at Thu Oct 20 08:25:06 2011
--
--- svn:log (original)
+++ svn:log Thu Oct 20 08:25:06 2011
@@ -1,4 +1,2 @@
-Merge r1152189-1152190 to
Author: philip
Date: Thu Oct 20 08:38:56 2011
New Revision: 118
URL: http://svn.apache.org/viewvc?rev=118view=rev
Log:
Rename 1.7.x-issue4032 to 1.7.x-issue4033
Added:
subversion/branches/1.7.x-issue4033/
- copied from r1186665, subversion/branches/1.7.x-issue4032/
Removed:
Author: philip
Date: Thu Oct 20 08:42:30 2011
New Revision: 1186668
URL: http://svn.apache.org/viewvc?rev=1186668view=rev
Log:
Create (using svnmucc!) a branch to backport issue 4032 to 1.7.x
Added:
subversion/branches/1.7.x-issue4032/
- copied from r1186667, subversion/branches/1.7.x/
Author: philip
Revision: 1186652
Modified property: svn:log
Modified: svn:log at Thu Oct 20 08:45:40 2011
--
--- svn:log (original)
+++ svn:log Thu Oct 20 08:45:40 2011
@@ -1 +1,4 @@
Create branch to backport issue 4032
Author: philip
Date: Thu Oct 20 09:52:40 2011
New Revision: 1186699
URL: http://svn.apache.org/viewvc?rev=1186699view=rev
Log:
* STATUS: Propose r1182771.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
Author: philip
Date: Thu Oct 20 10:54:28 2011
New Revision: 1186732
URL: http://svn.apache.org/viewvc?rev=1186732view=rev
Log:
* subversion/tests/cmdline/upgrade_tests.py
(upgrade_missing_replaced): Remove WIMP marker as this test now passes.
Modified:
Author: philip
Date: Thu Oct 20 11:02:17 2011
New Revision: 1186734
URL: http://svn.apache.org/viewvc?rev=1186734view=rev
Log:
* STATUS: Propose issue 4033.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
Author: rhuijben
Date: Thu Oct 20 11:08:37 2011
New Revision: 1186736
URL: http://svn.apache.org/viewvc?rev=1186736view=rev
Log:
* STATUS: Cast more votes
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
Author: philip
Date: Thu Oct 20 11:22:39 2011
New Revision: 1186739
URL: http://svn.apache.org/viewvc?rev=1186739view=rev
Log:
Move the svnmucc tests so they become part of the regression tests run
by 'make check'.
* subversion/tests/cmdline/svnmucc_tests.py
(test_svnmucc, xtest_svnmucc): New
Author: stsp
Date: Thu Oct 20 11:37:22 2011
New Revision: 1186747
URL: http://svn.apache.org/viewvc?rev=1186747view=rev
Log:
* STATUS: Vote for issue 4035 fix.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
Author: philip
Date: Thu Oct 20 12:10:58 2011
New Revision: 1186755
URL: http://svn.apache.org/viewvc?rev=1186755view=rev
Log:
Avoid spurious test failures in parallel mode caused by changing the UUID
of a repository that should be read-only.
* subversion/tests/cmdline/upgrade_tests.py
Author: philip
Date: Thu Oct 20 12:23:35 2011
New Revision: 1186758
URL: http://svn.apache.org/viewvc?rev=1186758view=rev
Log:
* STATUS: Propose r1186755
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
Author: stsp
Date: Thu Oct 20 12:34:54 2011
New Revision: 1186762
URL: http://svn.apache.org/viewvc?rev=1186762view=rev
Log:
* CHANGES: Update with 1.7.x backports. (r1186359 not listed explicitly as
it can be considered part of an existing entry)
Modified:
subversion/trunk/CHANGES
Author: hwright
Date: Thu Oct 20 13:02:54 2011
New Revision: 1186779
URL: http://svn.apache.org/viewvc?rev=1186779view=rev
Log:
Reintegrate the 1.7.x-issue4035-r1185738 branch, which merges the following:
* r1185738, r1185763, r1185768, r1185886, r1186240
Add support for upgrading absent
Author: julianfoad
Date: Thu Oct 20 13:04:07 2011
New Revision: 1186781
URL: http://svn.apache.org/viewvc?rev=1186781view=rev
Log:
* subversion/include/svn_repos.h
(svn_repos_load_fs4): Fix Doxygen mark-up.
Modified:
subversion/trunk/subversion/include/svn_repos.h
Modified:
Author: stsp
Date: Thu Oct 20 13:06:38 2011
New Revision: 1186783
URL: http://svn.apache.org/viewvc?rev=1186783view=rev
Log:
* CHANGES: sync with 1.7.x merges
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
Author: julianfoad
Date: Thu Oct 20 13:06:55 2011
New Revision: 1186784
URL: http://svn.apache.org/viewvc?rev=1186784view=rev
Log:
* build/ac-macros/berkeley-db.m4
(SVN_LIB_BERKELEY_DB): Adjust an error message to make more sense.
Modified:
subversion/trunk/build/ac-macros/berkeley-db.m4
Author: hwright
Date: Thu Oct 20 13:09:29 2011
New Revision: 1186785
URL: http://svn.apache.org/viewvc?rev=1186785view=rev
Log:
Reintegrate the 1.7.x-issue4032 branch:
* r1182771
Fix issue 4032
Justification:
Allow us to operate on existing invalid svn:mergeinfo
Branch:
Author: hwright
Date: Thu Oct 20 13:10:13 2011
New Revision: 1186786
URL: http://svn.apache.org/viewvc?rev=1186786view=rev
Log:
Remove the 1.7.x-issue4032 branch, reintegrated in r1186785.
Removed:
subversion/branches/1.7.x-issue4032/
Author: stsp
Date: Thu Oct 20 13:10:53 2011
New Revision: 1186788
URL: http://svn.apache.org/viewvc?rev=1186788view=rev
Log:
* CHANGES: sync to 1.7.x merges
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
Author: stsp
Date: Thu Oct 20 13:14:13 2011
New Revision: 1186789
URL: http://svn.apache.org/viewvc?rev=1186789view=rev
Log:
* CHANGES: wording tweak
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
Author: ivan
Date: Thu Oct 20 13:18:02 2011
New Revision: 1186791
URL: http://svn.apache.org/viewvc?rev=1186791view=rev
Log:
* STATUS: Cast a -0 vote for the r1185746 change.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
On Thu, Oct 20, 2011 at 8:18 AM, i...@apache.org wrote:
Author: ivan
Date: Thu Oct 20 13:18:02 2011
New Revision: 1186791
URL: http://svn.apache.org/viewvc?rev=1186791view=rev
Log:
* STATUS: Cast a -0 vote for the r1185746 change.
Modified:
subversion/branches/1.7.x/STATUS
Author: hwright
Date: Thu Oct 20 13:28:43 2011
New Revision: 1186792
URL: http://svn.apache.org/viewvc?rev=1186792view=rev
Log:
* STATUS: Remove obsolete note.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
Author: rhuijben
Date: Thu Oct 20 13:37:37 2011
New Revision: 1186798
URL: http://svn.apache.org/viewvc?rev=1186798view=rev
Log:
* STATUS: Include r1186755 in vote
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
On Thu, Oct 20, 2011 at 17:26, Hyrum K Wright hyrum.wri...@wandisco.com wrote:
On Thu, Oct 20, 2011 at 8:18 AM, i...@apache.org wrote:
Author: ivan
Date: Thu Oct 20 13:18:02 2011
New Revision: 1186791
URL: http://svn.apache.org/viewvc?rev=1186791view=rev
Log:
* STATUS: Cast a -0 vote for
Author: ivan
Date: Thu Oct 20 13:51:00 2011
New Revision: 1186809
URL: http://svn.apache.org/viewvc?rev=1186809view=rev
Log:
* STATUS: Remove my -0 vote for r1185746.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
Author: hwright
Date: Thu Oct 20 13:58:23 2011
New Revision: 1186814
URL: http://svn.apache.org/viewvc?rev=1186814view=rev
Log:
I like frobbing things.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
Author: julianfoad
Date: Thu Oct 20 14:00:04 2011
New Revision: 1186815
URL: http://svn.apache.org/viewvc?rev=1186815view=rev
Log:
* subversion/svn/changelist-cmd.c
(svn_cl__changelist): Fix error message wording. A follow-up to r1185746.
Modified:
Author: hwright
Date: Thu Oct 20 14:01:47 2011
New Revision: 1186816
URL: http://svn.apache.org/viewvc?rev=1186816view=rev
Log:
Merge r1185746, r1186059 from trunk:
* r1185746, r1186059
Fix up some erroneous Could not frob some targets because... warnings.
Votes:
+1: stsp, rhuijben,
Author: stsp
Date: Thu Oct 20 14:06:10 2011
New Revision: 1186820
URL: http://svn.apache.org/viewvc?rev=1186820view=rev
Log:
* CHANGES: sync with 1.7.x merges
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
Author: stsp
Date: Thu Oct 20 14:18:38 2011
New Revision: 1186825
URL: http://svn.apache.org/viewvc?rev=1186825view=rev
Log:
* CHANGES: add a missing 1.7.1 item + typo fix
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
Author: cmpilato
Date: Thu Oct 20 14:19:02 2011
New Revision: 1186826
URL: http://svn.apache.org/viewvc?rev=1186826view=rev
Log:
* CHANGES
Add template-esque placeholders for 1.8.0 changes, so we're at least
tempted to use similar categorizations as in previous releases.
Modified:
Author: cmpilato
Date: Thu Oct 20 14:20:07 2011
New Revision: 1186828
URL: http://svn.apache.org/viewvc?rev=1186828view=rev
Log:
* CHANGES
Note recent issue #3734 minor feature addition.
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
Author: hwright
Date: Thu Oct 20 15:36:21 2011
New Revision: 1186854
URL: http://svn.apache.org/viewvc?rev=1186854view=rev
Log:
Bring CHANGES up-to-date with trunk.
Modified:
subversion/branches/1.7.x/CHANGES (contents, props changed)
Modified: subversion/branches/1.7.x/CHANGES
URL:
Author: stsp
Date: Thu Oct 20 15:41:47 2011
New Revision: 1186859
URL: http://svn.apache.org/viewvc?rev=1186859view=rev
Log:
On the 1.7.x branch: Merge r1186815 (obvious fix).
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/subversion/svn/changelist-cmd.c
Author: hwright
Date: Thu Oct 20 16:16:35 2011
New Revision: 1186885
URL: http://svn.apache.org/viewvc?rev=1186885view=rev
Log:
Post-release version bump.
* STATUS,
* subversion/include/svn_version.h:
Bump to 1.7.2.
Modified:
subversion/branches/1.7.x/STATUS
Author: julianfoad
Date: Thu Oct 20 16:39:18 2011
New Revision: 1186906
URL: http://svn.apache.org/viewvc?rev=1186906view=rev
Log:
* STATUS: Nominate r1186784.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
Author: pburba
Date: Thu Oct 20 17:11:33 2011
New Revision: 1186928
URL: http://svn.apache.org/viewvc?rev=1186928view=rev
Log:
Don't rely on the current implementation of svn_ra_get_mergeinfo to
avoid a segfault when asking for mergeinfo from a repository which isn't
mergeinfo capable.
Author: pburba
Date: Thu Oct 20 17:12:46 2011
New Revision: 1186931
URL: http://svn.apache.org/viewvc?rev=1186931view=rev
Log:
Remove some redundant code and use an existing private function instead.
Patch by: julianfoad
Review by: me
* subversion/libsvn_client/mergeinfo.c
Author: pburba
Date: Thu Oct 20 17:20:34 2011
New Revision: 1186939
URL: http://svn.apache.org/viewvc?rev=1186939view=rev
Log:
* STATUS: Nominate r1186928.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
Author: stsp
Date: Thu Oct 20 17:28:11 2011
New Revision: 1186944
URL: http://svn.apache.org/viewvc?rev=1186944view=rev
Log:
Fix an assertion failure when updating a symlink. The client's method of
determining whether an incoming file is a symlink was faulty.
Reported by: Søren Thing Andersen
*
Author: stsp
Date: Thu Oct 20 17:29:56 2011
New Revision: 1186947
URL: http://svn.apache.org/viewvc?rev=1186947view=rev
Log:
* STATUS: Propose r1186944.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
Author: danielsh
Date: Thu Oct 20 18:27:30 2011
New Revision: 1186981
URL: http://svn.apache.org/viewvc?rev=1186981view=rev
Log:
* subversion/tests/cmdline/special_tests.py
(update_symlink): Sleep for timestamps.
Without this, r3 commit failed in some environments.
Modified:
Author: stsp
Date: Thu Oct 20 18:29:04 2011
New Revision: 1186982
URL: http://svn.apache.org/viewvc?rev=1186982view=rev
Log:
* STATUS: Add r1186981 to r1186944 nomination.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
Author: stsp
Date: Thu Oct 20 18:31:30 2011
New Revision: 1186983
URL: http://svn.apache.org/viewvc?rev=1186983view=rev
Log:
* subversion/libsvn_wc/update_editor.c
(close_file): Whitespace fix.
Modified:
subversion/trunk/subversion/libsvn_wc/update_editor.c
Modified:
Author: hwright
Date: Thu Oct 20 19:56:46 2011
New Revision: 1187026
URL: http://svn.apache.org/viewvc?rev=1187026view=rev
Log:
Ev2 shims: When we abort a run, we need to process the drive until the point,
as that is the historical behavior of the delta editor.
* subversion/libsvn_delta/compat.c
Author: pburba
Date: Thu Oct 20 20:44:26 2011
New Revision: 1187042
URL: http://svn.apache.org/viewvc?rev=1187042view=rev
Log:
* subversion/libsvn_subr/sorts.c
(svn_sort__array_delete): Simplify the code a bit. See
http://svn.haxx.se/dev/archive-2011-10/0306.shtml
Modified:
Author: hwright
Date: Fri Oct 21 01:40:03 2011
New Revision: 1187160
URL: http://svn.apache.org/viewvc?rev=1187160view=rev
Log:
Ev2 shims: Allow callers to pass the kind of a node when building a delta
editor tree. Most times, this information will be available for free.
*
Author: hwright
Date: Fri Oct 21 01:54:40 2011
New Revision: 1187166
URL: http://svn.apache.org/viewvc?rev=1187166view=rev
Log:
Remove a couple of unused variables that probably won't be used.
* subversion/libsvn_delta/compat.c
(ev2_close_directory, ev2_close_file): Remove baton variables.
Author: hwright
Date: Fri Oct 21 02:22:03 2011
New Revision: 1187167
URL: http://svn.apache.org/viewvc?rev=1187167view=rev
Log:
Ev2 shims: Adding files now works (as evidenced by repos-test 9)! However, the
setting of content does not currently function.
1178 tests currently fail.
*
56 matches
Mail list logo