Author: svn-role
Date: Wed Mar 18 04:03:17 2015
New Revision: 1667453
URL: http://svn.apache.org/r1667453
Log:
Remove the '1.8.x-r1619380' branch, merged in r1667452.
Removed:
subversion/branches/1.8.x-r1619380/
Author: svn-role
Date: Wed Mar 18 04:03:02 2015
New Revision: 1667452
URL: http://svn.apache.org/r1667452
Log:
Merge the 1.8.x-r1619380 branch:
* r1619380, r1619393, r1660186
Fix diff of a locally copied directory with props: it showed all props
as added instead of a diff against the copy-
Author: svn-role
Date: Wed Mar 18 04:02:55 2015
New Revision: 1667451
URL: http://svn.apache.org/r1667451
Log:
Remove the '1.8.x-r190' branch, merged in r1667450.
Removed:
subversion/branches/1.8.x-r190/
Author: svn-role
Date: Wed Mar 18 04:02:32 2015
New Revision: 1667449
URL: http://svn.apache.org/r1667449
Log:
Remove the '1.8.x-r1660220' branch, merged in r1667448.
Removed:
subversion/branches/1.8.x-r1660220/
Author: svn-role
Date: Wed Mar 18 04:02:40 2015
New Revision: 1667450
URL: http://svn.apache.org/r1667450
Log:
Merge the 1.8.x-r190 branch:
* r190
Record skipped tree during merge on the skip root instead of leaves
Justification:
Resolves a user reported problem in merge handl
Author: svn-role
Date: Wed Mar 18 04:02:10 2015
New Revision: 1667447
URL: http://svn.apache.org/r1667447
Log:
Remove the '1.8.x-r1664684' branch, merged in r1667446.
Removed:
subversion/branches/1.8.x-r1664684/
Author: svn-role
Date: Wed Mar 18 04:01:44 2015
New Revision: 1667444
URL: http://svn.apache.org/r1667444
Log:
Merge r1660646 from trunk:
* r1660646
Fix calculating the repository path of replaced directories on entry upgrade
Justification:
Simple fix that avoids recording invalid dat
Author: svn-role
Date: Wed Mar 18 04:01:24 2015
New Revision: 1667442
URL: http://svn.apache.org/r1667442
Log:
Merge the 1.8.x-r1660593 branch:
* ^/subversion/branches/1.8.x-r1660593
Fix recording last-* information on nodes copied from foreign repositories
Justification:
Recording re
Author: svn-role
Date: Wed Mar 18 04:01:55 2015
New Revision: 1667446
URL: http://svn.apache.org/r1667446
Log:
Merge the 1.8.x-r1664684 branch:
* r1664684
svnrdump: don't provide HEAD+1 as base revision when loading deletes.
Justification:
Our own tools should be well behaved.
Note
Author: svn-role
Date: Wed Mar 18 04:02:17 2015
New Revision: 1667448
URL: http://svn.apache.org/r1667448
Log:
Merge the 1.8.x-r1660220 branch:
* r1660220, r1665874
Don't leave conflict markers on files that are moved
Branch:
^/subversion/branches/1.8.x-r1660220
Justification:
Author: svn-role
Date: Wed Mar 18 04:01:40 2015
New Revision: 1667443
URL: http://svn.apache.org/r1667443
Log:
Remove the '1.8.x-r1660593' branch, merged in r1667442.
Removed:
subversion/branches/1.8.x-r1660593/
Author: svn-role
Date: Wed Mar 18 04:01:47 2015
New Revision: 1667445
URL: http://svn.apache.org/r1667445
Log:
Merge r1663991 from trunk:
* r1663991
Fix calculating the repository path after commits of nodes that are
shadowing a switched (not-present) node.
Justification:
Allows in
Author: svn-role
Date: Wed Mar 18 04:01:11 2015
New Revision: 1667441
URL: http://svn.apache.org/r1667441
Log:
Merge r1532287 from trunk:
* r1532287
Simplify Windows resource compilation to avoid warnings
Justification:
Windows .rc files are compiled with a resource compiler that uses
Author: svn-role
Date: Wed Mar 18 04:01:08 2015
New Revision: 1667440
URL: http://svn.apache.org/r1667440
Log:
Merge r1660071 from trunk:
* r1660071
When handling a pre-existing working copy as external, register it as such
Justification:
Without this the external is not properly hand
Author: svn-role
Date: Wed Mar 18 04:01:02 2015
New Revision: 1667439
URL: http://svn.apache.org/r1667439
Log:
Remove the '1.7.x-r1644595' branch, merged in r1667438.
Removed:
subversion/branches/1.7.x-r1644595/
Author: svn-role
Date: Wed Mar 18 04:00:47 2015
New Revision: 1667438
URL: http://svn.apache.org/r1667438
Log:
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
Author: rhuijben
Date: Tue Mar 17 20:11:35 2015
New Revision: 1667384
URL: http://svn.apache.org/r1667384
Log:
* STATUS: Nominate stsp's conflict resolver fixes and my related db
optimizations.
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
http:
Author: kotkov
Date: Tue Mar 17 18:31:22 2015
New Revision: 1667371
URL: http://svn.apache.org/r1667371
Log:
* STATUS: Put my temporary +0 for the r1666965 group.
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewvc/subversi
Author: stefan2
Date: Tue Mar 17 18:21:57 2015
New Revision: 1667370
URL: http://svn.apache.org/r1667370
Log:
* STATUS: Vote for & approve the r1619380 group.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/b
Author: rhuijben
Date: Tue Mar 17 17:39:22 2015
New Revision: 1667363
URL: http://svn.apache.org/r1667363
Log:
* STATUS: Combine two nominations that touch the same code.
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewvc/
Author: julianfoad
Date: Tue Mar 17 15:29:35 2015
New Revision: 1667334
URL: http://svn.apache.org/r1667334
Log:
* STATUS: Tweak my vote for r1666965 group (lag of first log results).
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apach
Author: breser
Date: Tue Mar 17 15:24:59 2015
New Revision: 8304
Log:
Publish Subversion-1.9.0-beta1.
Added:
release/subversion/subversion-1.9.0-beta1.tar.bz2
- copied unchanged from r8303,
dev/subversion/subversion-1.9.0-beta1.tar.bz2
release/subversion/subversion-1.9.0-beta1.tar.
Author: julianfoad
Date: Tue Mar 17 15:07:09 2015
New Revision: 1667323
URL: http://svn.apache.org/r1667323
Log:
* STATUS: Tweak my vote for r1666965 group (lag of first log results).
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apach
Author: rhuijben
Date: Tue Mar 17 15:13:18 2015
New Revision: 1667327
URL: http://svn.apache.org/r1667327
Log:
* STATUS: Apply some nomination tweaks suggested by danielsh.
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewv
Author: rhuijben
Date: Tue Mar 17 14:38:06 2015
New Revision: 1667315
URL: http://svn.apache.org/r1667315
Log:
Following up on r1667233, provide an APR error code for Subversion
clients in mod_dav_svn.
* subversion/mod_dav_svn/reports/get-location-segments.c
(dav_svn__get_location_segments_repo
Author: ivan
Date: Tue Mar 17 14:41:05 2015
New Revision: 1667316
URL: http://svn.apache.org/r1667316
Log:
* STATUS: Put my -0.5 on r1666965 group.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8
Author: julianfoad
Date: Tue Mar 17 14:02:46 2015
New Revision: 1667310
URL: http://svn.apache.org/r1667310
Log:
* STATUS: Tweak my vote for r1666965 group (lag of first log results).
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apach
Author: brane
Date: Tue Mar 17 13:50:22 2015
New Revision: 1667308
URL: http://svn.apache.org/r1667308
Log:
* branches/1.8.x/STATUS: Restore the nomination for the r1666965 group
that I accidentally deleted in r1667295.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branc
Author: brane
Date: Tue Mar 17 13:34:21 2015
New Revision: 1667303
URL: http://svn.apache.org/r1667303
Log:
* branches/1.7.x/STATUS: Approve r1644158.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/
Author: rhuijben
Date: Tue Mar 17 13:30:24 2015
New Revision: 1667301
URL: http://svn.apache.org/r1667301
Log:
Following up on r1667233, report errors from svnserve's get_location_segments
function in a way that the caller doesn't get a protocol error. Change the
error values to match what get_loc
Author: philip
Date: Tue Mar 17 13:24:58 2015
New Revision: 1667300
URL: http://svn.apache.org/r1667300
Log:
* STATUS: Vote/approve skipped mergeinfo fix.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branc
Author: philip
Date: Tue Mar 17 13:24:42 2015
New Revision: 1667299
URL: http://svn.apache.org/r1667299
Log:
* STATUS: Vote/approve skipped mergeinfo fix.
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branc
Author: rhuijben
Date: Tue Mar 17 13:17:05 2015
New Revision: 1667297
URL: http://svn.apache.org/r1667297
Log:
* STATUS: Approve addition of a regression test, and by that a backport
nomination.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http
Author: brane
Date: Tue Mar 17 13:13:45 2015
New Revision: 1667296
URL: http://svn.apache.org/r1667296
Log:
* branches/1.9.x/STATUS: Vote for r1664684 and r190.
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewvc/subver
Author: brane
Date: Tue Mar 17 13:08:24 2015
New Revision: 1667295
URL: http://svn.apache.org/r1667295
Log:
* branches/1.8.x/STATUS:
- Vote for the r1660220 and r1619380 groups, and r190.
- Approve r1660071, r1532287, r1660593, r1660646, r1663991 and r1664684.
Modified:
subversion/b
Author: rhuijben
Revision: 1667290
Modified property: svn:log
Modified: svn:log at Tue Mar 17 12:48:16 2015
--
--- svn:log (original)
+++ svn:log Tue Mar 17 12:48:16 2015
@@ -1,6 +1,6 @@
When obtaining conflicts from wc-d
Author: rhuijben
Date: Tue Mar 17 12:31:42 2015
New Revision: 1667290
URL: http://svn.apache.org/r1667290
Log:
When obtaining conflicts from wc-db, also allow directly obtaining properties.
We already read from the records that have the data, so this doesn't have a
real cost, while reading them se
Author: stsp
Date: Tue Mar 17 12:23:54 2015
New Revision: 1667283
URL: http://svn.apache.org/r1667283
Log:
Follow-up to r1667280: Fix a test failure.
* subversion/tests/cmdline/update_tests.py
(update_binary_file): Add 'theta.mine' to extra on-disk files.
Modified:
subversion/trunk/subvers
Author: stsp
Date: Tue Mar 17 12:05:10 2015
New Revision: 1667280
URL: http://svn.apache.org/r1667280
Log:
Always install a .mine file for conflicted binary files, not just in
case the binary file was detranslated.
This makes the 'mine-full' option work again from the conflict prompt.
Before this
Author: kotkov
Date: Tue Mar 17 11:00:55 2015
New Revision: 1667261
URL: http://svn.apache.org/r1667261
Log:
* CHANGES: Use the correct tag for 1.7.20.
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=166726
Author: kotkov
Date: Tue Mar 17 10:58:22 2015
New Revision: 1667260
URL: http://svn.apache.org/r1667260
Log:
* CHANGES: Update 1.8.12 and 1.7.20 entries.
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1667
Author: rhuijben
Date: Tue Mar 17 10:55:45 2015
New Revision: 1667258
URL: http://svn.apache.org/r1667258
Log:
Avoid a db operation for each property conflict in some invocations of
the interactive conflict resolver.
* subversion/libsvn_wc/conflicts.c
(generate_propconflict): Add kind argument.
Author: philip
Date: Tue Mar 17 10:54:26 2015
New Revision: 1667256
URL: http://svn.apache.org/r1667256
Log:
* STATUS: Vote for log flush fix.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/ST
Author: philip
Date: Tue Mar 17 10:54:10 2015
New Revision: 1667254
URL: http://svn.apache.org/r1667254
Log:
* STATUS: Vote for log flush fix.
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/ST
Author: stsp
Date: Tue Mar 17 10:46:53 2015
New Revision: 1667250
URL: http://svn.apache.org/r1667250
Log:
* subversion/svn/conflict-callbacks.c
(handle_text_conflict): Clearly identify a binary file as 'binary' in the
conflict menu prompt.
Modified:
subversion/trunk/subversion/svn/confl
Author: stsp
Date: Tue Mar 17 10:42:24 2015
New Revision: 1667249
URL: http://svn.apache.org/r1667249
Log:
* subversion/svn/conflict-callbacks.c
(handle_text_conflict): Don't allow diffs for binary files.
This restores the 'mine-full' and 'theirs-full' options for binary files,
which since
Author: kotkov
Date: Tue Mar 17 10:37:44 2015
New Revision: 1667248
URL: http://svn.apache.org/r1667248
Log:
Merge r1667235 from trunk:
* r1667235
Reject invalid transaction property change requests.
Justification:
These requests aren't valid and should result in an error.
Votes:
Author: kotkov
Date: Tue Mar 17 10:35:02 2015
New Revision: 1667246
URL: http://svn.apache.org/r1667246
Log:
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 a
Author: kotkov
Date: Tue Mar 17 10:31:39 2015
New Revision: 1667245
URL: http://svn.apache.org/r1667245
Log:
Merge r1655651 from trunk:
* r1655651
Rework the way FSFS L1 DAG cache (fs_fs_dag_cache_t) deals with the
lifetime of the cached nodes.
Justification:
Reduces memory consump
Author: kotkov
Date: Tue Mar 17 10:27:44 2015
New Revision: 1667241
URL: http://svn.apache.org/r1667241
Log:
Merge r1667235 from trunk:
* r1667235
Reject invalid transaction property change requests.
Justification:
These requests aren't valid and should result in an error.
Votes:
Author: kotkov
Date: Tue Mar 17 10:25:02 2015
New Revision: 1667240
URL: http://svn.apache.org/r1667240
Log:
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 a
Author: stsp
Revision: 1667199
Modified property: svn:log
Modified: svn:log at Tue Mar 17 10:25:37 2015
--
--- svn:log (original)
+++ svn:log Tue Mar 17 10:25:37 2015
@@ -1,3 +1,5 @@
+[ Note from the future: Reverted in r1
Author: stsp
Date: Tue Mar 17 10:22:40 2015
New Revision: 1667237
URL: http://svn.apache.org/r1667237
Log:
Revert r1667199, which a disable-sleep-for-timestamps API for C tests.
These API was added for a new test committed in r1667228.
As of r1667234 the test does not need to disable sleep for tim
Author: rhuijben
Date: Tue Mar 17 10:19:11 2015
New Revision: 1667236
URL: http://svn.apache.org/r1667236
Log:
* STATUS: Add nomination.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?r
Author: kotkov
Date: Tue Mar 17 10:18:42 2015
New Revision: 1667235
URL: http://svn.apache.org/r1667235
Log:
mod_dav_svn: Reject invalid transaction property change requests.
* subversion/mod_dav_svn/deadprops.c
(change_txn_prop): New helper function that performs sanity checking.
(save_value
Author: stsp
Date: Tue Mar 17 10:17:27 2015
New Revision: 1667234
URL: http://svn.apache.org/r1667234
Log:
* subversion/tests/libsvn_wc/conflict-data-test.c
(test_binary_file_conflict): Ensure that file size changes when
the binary file is changed. Makes sleep for timestamp unnecessary.
Sugg
Author: kotkov
Date: Tue Mar 17 10:17:01 2015
New Revision: 1667233
URL: http://svn.apache.org/r1667233
Log:
Reject invalid get-location-segments requests in mod_dav_svn and svnserve.
* subversion/mod_dav_svn/reports/get-location-segments.c
(dav_svn__get_location_segments_report): Extend the sa
Author: rhuijben
Date: Tue Mar 17 10:16:35 2015
New Revision: 1667232
URL: http://svn.apache.org/r1667232
Log:
* STATUS: Add r1667120.
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev
Author: stsp
Date: Tue Mar 17 10:05:53 2015
New Revision: 1667228
URL: http://svn.apache.org/r1667228
Log:
Fix text conflict description for binary files.
The is_binary flag in conflict description was set to zero even
for binary files. As a result, 'svn resolve' offered 'mine-conflict'
and 'thei
Author: julianfoad
Date: Tue Mar 17 09:43:33 2015
New Revision: 1667222
URL: http://svn.apache.org/r1667222
Log:
* STATUS: Nominate FSFS id relatedness fixes r1665894, r1667101.
Modified:
subversion/branches/1.9.x/STATUS
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/
Author: stsp
Date: Tue Mar 17 09:17:47 2015
New Revision: 1667199
URL: http://svn.apache.org/r1667199
Log:
Provide a way for C tests to enable sleep for timestamps.
Needed for an upcoming new test. No functional change.
* subversion/tests/svn_test.h
(svn_test__enable_sleep_for_timestamps,
s
61 matches
Mail list logo
