Author: pburba
Date: Thu May 7 20:01:37 2015
New Revision: 8884
Log:
* subversion-1.9.0-rc1.zip.asc: Add my signature.
Modified:
dev/subversion/subversion-1.9.0-rc1.zip.asc
Modified: dev/subversion/subversion-1.9.0-rc1.zip.asc
Author: pburba
Date: Thu Aug 7 19:16:00 2014
New Revision: 6073
Log:
* subversion-1.7.18.zip.asc: Add my signature.
* subversion-1.8.10.zip.asc: Ditto.
Modified:
dev/subversion/subversion-1.7.18.zip.asc
dev/subversion/subversion-1.8.10.zip.asc
Modified: dev/subversion/subversion-1.7.18
Author: pburba
Date: Wed Nov 20 13:39:56 2013
New Revision: 3619
Log:
* subversion-1.7.14.zip.asc: Add my sigs.
Modified:
dev/subversion/subversion-1.7.14.zip.asc
Modified: dev/subversion/subversion-1.7.14.zip.asc
Author: pburba
Date: Wed Nov 20 17:41:23 2013
New Revision: 3624
Log:
* subversion-1.8.5.zip.asc: Add my sig.
Modified:
dev/subversion/subversion-1.8.5.zip.asc
Modified: dev/subversion/subversion-1.8.5.zip.asc
Author: pburba
Date: Wed Nov 20 17:41:39 2013
New Revision: 1543889
URL: http://svn.apache.org/r1543889
Log:
* STATUS: Vote and approve r1499470 group.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: pburba
Date: Wed Oct 23 03:08:01 2013
New Revision: 3326
Log:
* subversion-1.8.4.zip.asc: Add my sig.
Modified:
dev/subversion/subversion-1.8.4.zip.asc
Modified: dev/subversion/subversion-1.8.4.zip.asc
Author: pburba
Date: Sat Aug 24 01:25:00 2013
New Revision: 2792
Log:
* subversion-1.7.13.zip.asc
* subversion-1.8.3.zip.asc
Add my sigs.
Modified:
dev/subversion/subversion-1.7.13.zip.asc
dev/subversion/subversion-1.8.3.zip.asc
Modified: dev/subversion/subversion-1.7.13.zip.asc
Author: pburba
Date: Wed Jul 17 16:32:03 2013
New Revision: 2501
Log:
* subversion-1.8.0.zip.asc: Add my signature for subversion-1.8.1.zip.
Modified:
dev/subversion/subversion-1.8.1.zip.asc
Modified: dev/subversion/subversion-1.8.1.zip.asc
Author: pburba
Date: Mon Jun 24 16:15:27 2013
New Revision: 1496110
URL: http://svn.apache.org/r1496110
Log:
Avoid a segfault in svn_client_log5, see
http://svn.haxx.se/dev/archive-2013-06/0522.shtml
* subversion/libsvn_client/log.c
(run_ra_get_log): bsearch can return NULL, so handle
Author: pburba
Date: Mon Jun 24 16:22:21 2013
New Revision: 1496113
URL: http://svn.apache.org/r1496113
Log:
* STATUS: Nominate r1496110.
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
Author: pburba
Date: Fri Jun 14 15:00:04 2013
New Revision: 2189
Log:
* subversion-1.8.0.zip.asc: Add my signature for subversion-1.8.0.zip.
Modified:
dev/subversion/subversion-1.8.0.zip.asc
Modified: dev/subversion/subversion-1.8.0.zip.asc
Author: pburba
Date: Wed Jun 12 17:21:02 2013
New Revision: 1492295
URL: http://svn.apache.org/r1492295
Log:
Follow-up to r1480412: Unbreak the Ruby binding tests with out-of-tree
builds.
See http://svn.haxx.se/dev/archive-2013-06/0134.shtml
* subversion/bindings/swig/ruby/test/util.rb
Author: pburba
Date: Fri Jun 7 17:34:33 2013
New Revision: 2146
Log:
* subversion-1.8.0-rc3.zip.asc: Add my signature.
Modified:
dev/subversion/subversion-1.8.0-rc3.zip.asc
Modified: dev/subversion/subversion-1.8.0-rc3.zip.asc
Author: pburba
Date: Tue Jun 4 15:34:36 2013
New Revision: 1489478
URL: http://svn.apache.org/r1489478
Log:
* STATUS: Vote and approve r1489203.
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: pburba
Date: Sat Jun 1 12:23:52 2013
New Revision: 1488507
URL: http://svn.apache.org/r1488507
Log:
* STATUS: Correct the nominated revision for the issue #4370 fix.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org
Author: pburba
Date: Fri May 31 15:06:11 2013
New Revision: 1488267
URL: http://svn.apache.org/r1488267
Log:
Fix issue #4370 '(m)erge interactive conflict resolution segfaults when
cwd not parent of target'.
* subversion/svn/file-merge.c
(svn_cl__merge_file): Don't assume WC_PATH
Author: pburba
Date: Fri May 31 15:44:13 2013
New Revision: 1488281
URL: http://svn.apache.org/r1488281
Log:
* STATUS: Nominated issue #4370 '(m)erge interactive conflict resolution
segfaults when cwd not parent of target' fix.
Modified:
subversion/branches/1.8.x/STATUS
Modified
Author: pburba
Date: Tue May 28 14:22:13 2013
New Revision: 1486932
URL: http://svn.apache.org/r1486932
Log:
* STATUS: Add r1486931 to r1480344 group.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: pburba
Date: Thu May 23 18:10:47 2013
New Revision: 2039
Log:
* subversion-1.6.23.zip.asc: Add my signature.
Modified:
dev/subversion/subversion-1.6.23.zip.asc
Modified: dev/subversion/subversion-1.6.23.zip.asc
Author: pburba
Date: Thu May 23 20:15:24 2013
New Revision: 2040
Log:
* subversion-1.7.10.zip.asc: Add my signature.
Modified:
dev/subversion/subversion-1.7.10.zip.asc
Modified: dev/subversion/subversion-1.7.10.zip.asc
Author: pburba
Date: Tue May 21 14:48:37 2013
New Revision: 1484823
URL: http://svn.apache.org/r1484823
Log:
* STATUS: Cast a slew of votes.
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
Author: pburba
Date: Fri May 17 17:53:48 2013
New Revision: 1483927
URL: http://svn.apache.org/r1483927
Log:
Minor correction to test for issue #4367 'merge to shallow WC, repeat merge
to infinite depth WC is broken'.
* subversion/tests/cmdline/merge_tests.py
Author: pburba
Date: Fri May 17 18:45:53 2013
New Revision: 1483947
URL: http://svn.apache.org/r1483947
Log:
Fix issue #4367 'merge to shallow WC, repeat merge to infinite depth WC is
broken'.
* subversion/libsvn_client/merge.c
(merge_dir_opened,
merge_dir_added): A merge may be broken
Author: pburba
Date: Fri May 17 21:01:26 2013
New Revision: 1483991
URL: http://svn.apache.org/r1483991
Log:
* STATUS: Nominate the issue #4367 test and fix.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: pburba
Revision: 1443383
Modified property: svn:log
Modified: svn:log at Thu May 16 13:54:57 2013
--
--- svn:log (original)
+++ svn:log Thu May 16 13:54:57 2013
@@ -1,5 +1,5 @@
-In preparation for resolving #3806
Author: pburba
Date: Thu May 16 20:40:51 2013
New Revision: 1483555
URL: http://svn.apache.org/r1483555
Log:
Revise test for issue #4367 'merge to shallow WC, repeat merge to infinite
depth WC is broken'.
* subversion/tests/cmdline/merge_tests.py
(merge_to_empty_target_merge_to_infinite_target
Author: pburba
Date: Wed May 15 23:35:51 2013
New Revision: 1483125
URL: http://svn.apache.org/r1483125
Log:
Add a test for issue #4367 'merge to shallow WC, repeat merge to infinite
depth WC is broken'.
* subversion/tests/cmdline/merge_tests.py
(merge_to_empty_target_merge_to_infinite_target
Author: pburba
Date: Tue May 14 17:31:50 2013
New Revision: 1482479
URL: http://svn.apache.org/r1482479
Log:
* subversion/bindings/swig/ruby/test/windows_util.rb
(SvnTestUtil.Windows.Svnserve.setup_svnserve): Rescue an Errno::EACCES
error, sleep, and attempt a few retries in an attempt
Author: pburba
Date: Tue May 14 19:07:34 2013
New Revision: 1482524
URL: http://svn.apache.org/r1482524
Log:
* subversion/bindings/swig/ruby/test/windows_util.rb
(SvnTestUtil.Windows.Svnserve.setup_svnserve): Allow Ruby binding tests to
run with BDB versions other than 4.4. Also remove some
Author: pburba
Date: Tue May 14 19:17:59 2013
New Revision: 1482528
URL: http://svn.apache.org/r1482528
Log:
* subversion/bindings/swig/ruby/test/windows_util.rb
(SvnTestUtil.Windows.Svnserve.setup_svnserve): Allow Ruby binding tests to
run on Windows with static builds of svnserve.exe
Author: pburba
Date: Tue May 14 19:40:00 2013
New Revision: 1482536
URL: http://svn.apache.org/r1482536
Log:
Follow-up to r1298434 and r1298465, fix the long broken Ruby binding tests
on Windows.
Previously, when setting up the test sandbox, we tried to import from a
temporary path, which
Author: pburba
Date: Wed May 15 01:34:56 2013
New Revision: 1999
Log:
* subversion-1.8.0-rc2.zip.asc: Add my signature.
Modified:
dev/subversion/subversion-1.8.0-rc2.zip.asc
Modified: dev/subversion/subversion-1.8.0-rc2.zip.asc
Author: pburba
Date: Thu May 9 16:58:17 2013
New Revision: 1480723
URL: http://svn.apache.org/r1480723
Log:
More cleanup to issue #4355 'svn_client_log5 broken with multiple
revisions which span a rename' fix in r1478220.
Suggested by: cmpilato, julianfoad
* subversion/libsvn_client/log.c
Author: pburba
Date: Thu May 9 17:41:26 2013
New Revision: 1480727
URL: http://svn.apache.org/r1480727
Log:
* STATUS: Add r1478998 and r1480723 to issue #4355 group.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc
Author: pburba
Date: Thu May 9 18:49:32 2013
New Revision: 1480738
URL: http://svn.apache.org/r1480738
Log:
Any Ruby 1.9 fix for Windows.
* subversion/bindings/swig/ruby/test/windows_util.rb
(SvnTestUtil.Windows.SetupEnvironment.gen_make_opts): String objects in 1.9
no longer have the to_a
Author: pburba
Revision: 1480738
Modified property: svn:log
Modified: svn:log at Thu May 9 18:50:15 2013
--
--- svn:log (original)
+++ svn:log Thu May 9 18:50:15 2013
@@ -1,4 +1,4 @@
-Any Ruby 1.9 fix for Windows
Author: pburba
Revision: 1480442
Modified property: svn:log
Modified: svn:log at Thu May 9 19:11:18 2013
--
--- svn:log (original)
+++ svn:log Thu May 9 19:11:18 2013
@@ -3,7 +3,7 @@ Follow-up to r1442063: Fix broken
Author: pburba
Date: Thu May 9 20:36:32 2013
New Revision: 1480765
URL: http://svn.apache.org/r1480765
Log:
* subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h
(ruby/io.h): Include the appropriate Ruby header if using Ruby 1.9 and
thus avoid the 'use ruby/io.h instead of rubyio.h
Author: pburba
Date: Wed May 8 20:35:42 2013
New Revision: 1480442
URL: http://svn.apache.org/r1480442
Log:
Follow-up to r1442063: Fix broken ruby bindings build on Windows.
r1442063 turned the Windows compiler warning C4204 nonstandard extension
used : non-constant aggregate initializer
Author: pburba
Date: Fri May 3 21:50:52 2013
New Revision: 1478987
URL: http://svn.apache.org/r1478987
Log:
A small bit of issue #4351 'improve automatic merge performance' work: Avoid
one to two network roundtrips to get the *same* mergeinfo catalogs while
calculating automatic merges
Author: pburba
Date: Thu May 2 15:40:02 2013
New Revision: 1478417
URL: http://svn.apache.org/r1478417
Log:
* STATUS: Nominate fixes for issue #4355 'svn_client_log5 broken with
multiple revisions which span a rename'.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion
Author: pburba
Date: Thu May 2 18:22:16 2013
New Revision: 1478473
URL: http://svn.apache.org/r1478473
Log:
* STATUS: Add r1478465 to the issue #4355 group.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: pburba
Date: Fri Apr 26 15:24:25 2013
New Revision: 1476255
URL: http://svn.apache.org/r1476255
Log:
* STATUS: Add r1475963 and r1476155 to the r1470904 group. Remove my veto.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http
Author: pburba
Date: Fri Apr 26 18:40:54 2013
New Revision: 1476335
URL: http://svn.apache.org/r1476335
Log:
* STATUS: Vote on the additions to the r1470904 group.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc
Author: pburba
Revision: 1469489
Modified property: svn:log
Modified: svn:log at Wed Apr 24 13:47:04 2013
--
--- svn:log (original)
+++ svn:log Wed Apr 24 13:47:04 2013
@@ -1,2 +1,2 @@
* subversion/tests/cmdline
Author: pburba
Revision: 1469512
Modified property: svn:log
Modified: svn:log at Wed Apr 24 13:47:19 2013
--
--- svn:log (original)
+++ svn:log Wed Apr 24 13:47:19 2013
@@ -1,4 +1,4 @@
-Fix issue 4356, status segv after
Author: pburba
Date: Wed Apr 24 16:23:21 2013
New Revision: 1471509
URL: http://svn.apache.org/r1471509
Log:
* STATUS: Vote an approve issue #4356 group.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: pburba
Revision: 1471509
Modified property: svn:log
Modified: svn:log at Wed Apr 24 16:23:57 2013
--
--- svn:log (original)
+++ svn:log Wed Apr 24 16:23:57 2013
@@ -1,2 +1,2 @@
-* STATUS: Vote an approve issue
Author: pburba
Date: Wed Apr 24 16:46:38 2013
New Revision: 1471529
URL: http://svn.apache.org/r1471529
Log:
* STATUS: Vote and approve r1470248.
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: pburba
Date: Wed Apr 24 22:00:10 2013
New Revision: 1471716
URL: http://svn.apache.org/r1471716
Log:
* STATUS: (An almost certainly temporary) veto of r1470904 while some things
get cleared up on the dev list.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion
Author: pburba
Date: Mon Apr 22 14:23:13 2013
New Revision: 1470537
URL: http://svn.apache.org/r1470537
Log:
More failing issue #4355 'svn_client_log5 broken with multiple revisions
which span a rename' use cases.
* subversion/tests/cmdline/log_tests.py
(log_multiple_revs_spanning_rename
Author: pburba
Date: Mon Apr 22 15:02:53 2013
New Revision: 1470566
URL: http://svn.apache.org/r1470566
Log:
Back to the drawing board: Revert non-test portions of flawed issue #4355
work made in r1469515 and r1469982. See
http://svn.haxx.se/dev/archive-2013-04/0443.shtml
* subversion/include
Author: pburba
Date: Fri Apr 19 18:21:36 2013
New Revision: 1469982
URL: http://svn.apache.org/r1469982
Log:
2nd attempt to fix issue #4355 'svn_client_log5 broken with multiple
revisions which span a rename'.
* subversion/include/private/svn_client_private.h
(svn_client__resolve_rev_and_url
Author: pburba
Date: Thu Apr 18 15:10:59 2013
New Revision: 1469363
URL: http://svn.apache.org/r1469363
Log:
Add test for issue #4355 'svn_client_log5 broken with multiple revisions
which span a rename'.
* subversion/tests/cmdline/log_tests.py
(log_multiple_revs_spanning_rename): New
Author: pburba
Date: Thu Apr 18 18:29:34 2013
New Revision: 1469515
URL: http://svn.apache.org/r1469515
Log:
Fix issue #4355 'svn_client_log5 broken with multiple revisions which span
a rename'.
* subversion/libsvn_client/log.c
(svn_client_log5): Reparent RA session if necessary
Author: pburba
Date: Thu Apr 18 18:42:25 2013
New Revision: 1469521
URL: http://svn.apache.org/r1469521
Log:
* STATUS: Nominate issue #4355 'svn_client_log5 broken with multiple
revisions which span a rename' fix.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches
Author: pburba
Date: Thu Apr 18 19:44:15 2013
New Revision: 1469539
URL: http://svn.apache.org/r1469539
Log:
* STATUS: Pull issue #4355 nomination for the moment -- It introduces a
regression.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL
Author: pburba
Date: Fri Apr 19 00:11:41 2013
New Revision: 1469645
URL: http://svn.apache.org/r1469645
Log:
Adjust test for reopened issue #4355 'svn_client_log5 broken with multiple
revisions which span a rename'.
* subversion/tests/cmdline/log_tests.py
(log_multiple_revs_spanning_rename
Author: pburba
Date: Wed Apr 17 15:50:27 2013
New Revision: 1468980
URL: http://svn.apache.org/r1468980
Log:
* subversion/libsvn_client/mergeinfo.c
(logs_for_mergeinfo_rangelist): No need for qsort, svn_rangelist_t are
already sorted.
Modified:
subversion/trunk/subversion/libsvn_client
Author: pburba
Date: Mon Apr 15 13:49:46 2013
New Revision: 1468075
URL: http://svn.apache.org/r1468075
Log:
* STATUS: Cast some 1.8 votes.
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
Author: pburba
Date: Mon Apr 15 14:57:31 2013
New Revision: 1468105
URL: http://svn.apache.org/r1468105
Log:
* STATUS: Some more votes.
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
Author: pburba
Date: Fri Apr 12 16:38:33 2013
New Revision: 1467341
URL: http://svn.apache.org/r1467341
Log:
* subversion/libsvn_client/merge.c
(operative_rev_receiver): Add a comment explaining how what appears at
first glance (to me at any rate) to be a bug, is actually not a problem
Author: pburba
Date: Mon Apr 8 16:25:18 2013
New Revision: 1465677
URL: http://svn.apache.org/r1465677
Log:
Another automatic merge optimization.
* subversion/libsvn_client/merge.c:
(find_last_merged_location): Limit the log range requested when finding
the oldest eligible revision
Author: pburba
Date: Thu Apr 4 17:20:14 2013
New Revision: 1464647
URL: http://svn.apache.org/r1464647
Log:
Factor out some duplicate code in find_last_merged_location(). No logical
change.
* subversion/libsvn_client/merge.c
(short_circuit_mergeinfo_log): New.
(find_last_merged_location
Author: pburba
Date: Wed Apr 3 16:50:22 2013
New Revision: 1464102
URL: http://svn.apache.org/r1464102
Log:
Fix issue #4329 'automatic merge uses reintegrate type merge if source is
fully synced' and issue #4258 'Automatic merge after subtree merge in
opposite direction'.
* subversion
Author: pburba
Date: Wed Apr 3 20:45:38 2013
New Revision: 1464199
URL: http://svn.apache.org/r1464199
Log:
A minor automatic merge optimization.
* subversion/libsvn_client/merge.c:
(source_and_target_t): Remove source_mergeinfo and target_mergeinfo
members, they are no longer referenced
Author: pburba
Date: Mon Apr 1 18:22:20 2013
New Revision: 1463237
URL: http://svn.apache.org/r1463237
Log:
Support 'svn mergeinfo -rSTART:END' requests where START END.
Nobody is clamoring for this feature, but the API changes may help me with
an an ongoing issue #4329 'automatic merge uses
Author: pburba
Date: Fri Mar 29 20:13:57 2013
New Revision: 1665
Log:
* subversion-1.7.9.zip.asc: Add my signature.
Modified:
dev/subversion/subversion-1.7.9.zip.asc
Modified: dev/subversion/subversion-1.7.9.zip.asc
Author: pburba
Date: Mon Mar 25 21:52:39 2013
New Revision: 1460910
URL: http://svn.apache.org/r1460910
Log:
* STATUS: Cast some votes.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS
Author: pburba
Date: Fri Mar 22 16:56:39 2013
New Revision: 1459895
URL: http://svn.apache.org/r1459895
Log:
Keep '--- Merging *' and '--- Recording mergeinfo *' notifications
consistent when a file merge is broken into multiple editor drives.
* subversion/libsvn_client/merge.c
(do_file_merge
Author: pburba
Date: Wed Mar 20 16:33:47 2013
New Revision: 1458931
URL: http://svn.apache.org/r1458931
Log:
Fix issue #3247 'merge doesn't honour specified SOURCE'.
* subversion/svn/svn.c
(svn_cl__cmd_table): Accurately describe the current 'svn merge' behavior
for implied merge targets
Author: pburba
Date: Fri Mar 15 18:27:33 2013
New Revision: 1457046
URL: http://svn.apache.org/r1457046
Log:
Fix a segfault when performing an --ignore-ancestry file merge.
See http://svn.haxx.se/dev/archive-2013-03/0252.shtml
* subversion/libsvn_client/merge.c
(do_file_merge): Initialize
Author: pburba
Date: Tue Mar 12 23:57:37 2013
New Revision: 1455761
URL: http://svn.apache.org/r1455761
Log:
* subversion/tests/cmdline/merge_authz_tests.py
(merge_notifications_and_authz_skips): Remove this test. The associated
issue #4319 was closed -- the problematic behavior this test
Author: pburba
Date: Thu Mar 7 16:16:20 2013
New Revision: 1453940
URL: http://svn.apache.org/r1453940
Log:
* subversion/libsvn_wc/status.c
(one_child_status): Remove mention of non-existent argument in doc string.
Modified:
subversion/trunk/subversion/libsvn_wc/status.c
Modified
Author: pburba
Date: Wed Mar 6 17:00:46 2013
New Revision: 1453425
URL: http://svn.apache.org/r1453425
Log:
Fix issue #4132 'merge of replaced source asserts'.
* subversion/libsvn_client/merge.c
(find_gaps_in_merge_source_history): Return early if there can't possibly
be a gap
Author: pburba
Date: Thu Mar 7 00:55:09 2013
New Revision: 1453635
URL: http://svn.apache.org/r1453635
Log:
Fix issue #4138 'replacement in merge source not notified correctly'.
* subversion/libsvn_client/merge.c
(remove_source_gap): New.
(notify_merge_begin
Author: pburba
Date: Thu Feb 28 17:34:26 2013
New Revision: 1451263
URL: http://svn.apache.org/r1451263
Log:
Add test for issue #4329 'automatic merge uses reintegrate type merge if
source is fully synced'.
* subversion/tests/cmdline/merge_automatic_tests.py
Author: pburba
Date: Thu Feb 28 20:16:39 2013
New Revision: 1451327
URL: http://svn.apache.org/r1451327
Log:
Restore test for issue #3577 which got accidentally got removed by some
jerk[1] way back in r953878.
* subversion/tests/cmdline/merge_reintegrate_tests.py
Author: pburba
Date: Thu Feb 28 20:17:08 2013
New Revision: 1451328
URL: http://svn.apache.org/r1451328
Log:
* subversion/svn/merge-cmd.c
(run_merge): Remove unreferenced argument.
(svn_cl__merge): Update sole caller to run_merge().
Modified:
subversion/trunk/subversion/svn/merge
Author: pburba
Date: Wed Feb 13 15:54:28 2013
New Revision: 1445694
URL: http://svn.apache.org/r1445694
Log:
* subversion/tests/cmdline/merge_authz_tests.py
(mergeinfo_and_skipped_paths,
merge_fails_if_subtree_is_deleted_on_src,
reintegrate_fails_if_no_root_access): Use sbox.ospath
Author: pburba
Date: Wed Feb 13 19:17:46 2013
New Revision: 1445870
URL: http://svn.apache.org/r1445870
Log:
Add test for issue #4319 'faulty merge notifications when target subtree
unreadable'.
*subversion/tests/cmdline/merge_authz_tests.py
(merge_notifications_and_authz_skips): New
Author: pburba
Date: Tue Feb 12 13:55:15 2013
New Revision: 1445171
URL: http://svn.apache.org/r1445171
Log:
Fix intermittent failure of merge_tests.py 137: 'single editor drive
notifications'. This is the test for issue #4317 redundant notifications
in single editor drive merge.
* subversion
Author: pburba
Date: Wed Feb 13 02:01:45 2013
New Revision: 1445454
URL: http://svn.apache.org/r1445454
Log:
On the 1.7.x-issue4306 branch: Follow-up to r1442367.
* subversion/tests/cmdline/merge_tests.py
(conflict_aborted_mergeinfo_described_partial_merge): Revert the 1.7
version
Author: pburba
Date: Tue Feb 12 03:34:31 2013
New Revision: 1445029
URL: http://svn.apache.org/r1445029
Log:
Fix issue #4137 'redundant notifications in single editor drive merge'.
* subversion/libsvn_client/merge.c
(find_nearest_ancestor_with_intersecting_ranges): New.
(notify_merge_begin
Author: pburba
Date: Wed Feb 6 16:21:33 2013
New Revision: 1443040
URL: http://svn.apache.org/viewvc?rev=1443040view=rev
Log:
Make automatic merges respect our merge source normalization requirements.
This fixes issue #4313 'replaced merges source causes assertion during
automatic merge
Author: pburba
Date: Wed Feb 6 17:03:54 2013
New Revision: 1443070
URL: http://svn.apache.org/viewvc?rev=1443070view=rev
Log:
Follow-up to r1443040, reuse a session.
* subversion/libsvn_client/merge.c
(do_automatic_merge_locked): Pass the session we open to normalize merge
sources
Author: pburba
Revision: 1442285
Modified property: svn:log
Modified: svn:log at Wed Feb 6 17:56:32 2013
--
--- svn:log (original)
+++ svn:log Wed Feb 6 17:56:32 2013
@@ -1,3 +1,5 @@
+Fix issue #4311 'excessive
Author: pburba
Date: Tue Feb 5 23:00:10 2013
New Revision: 1442785
URL: http://svn.apache.org/viewvc?rev=1442785view=rev
Log:
Expand test coverage for issue #4138 'replacement in merge source not
notified correctly'.
* subversion/tests/cmdline/merge_tests.py
(merge_source_with_replacement
Author: pburba
Date: Wed Feb 6 00:10:51 2013
New Revision: 1442808
URL: http://svn.apache.org/viewvc?rev=1442808view=rev
Log:
Add test for issue #4313 'replaced merges source causes assertion during
automatic merge'.
* subversion/tests/cmdline/merge_tests.py
Author: pburba
Date: Wed Feb 6 00:15:46 2013
New Revision: 1442810
URL: http://svn.apache.org/viewvc?rev=1442810view=rev
Log:
Move a test to a more appropriate home.
* subversion/tests/cmdline/merge_tests.py
(auto_merge_handles_replacements_in_merge_source): Move from here to...
* subversion
Author: pburba
Date: Mon Feb 4 21:21:07 2013
New Revision: 1442367
URL: http://svn.apache.org/viewvc?rev=1442367view=rev
Log:
Merge r1441810 from ^/subversion/trunk.
* src-branch-1.7.x: Mergeinfo changes only
* subversion/libsvn_client/merge.c: Clean merge of r1441810.
* subversion/tests
Author: pburba
Date: Mon Feb 4 21:21:33 2013
New Revision: 1442368
URL: http://svn.apache.org/viewvc?rev=1442368view=rev
Log:
* STATUS: Add r1441810 to the issue #4306 group.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org
Author: pburba
Date: Fri Feb 1 17:45:07 2013
New Revision: 1441553
URL: http://svn.apache.org/viewvc?rev=1441553view=rev
Log:
Add a test for issue #4310 each editor drive gets its own notification
during 'svn merge'.
* subversion/tests/cmdline/merge_tests.py
Author: pburba
Date: Fri Feb 1 17:49:26 2013
New Revision: 1441556
URL: http://svn.apache.org/viewvc?rev=1441556view=rev
Log:
Add a dose of common sense to test for issue #4306 'multiple editor drive
file merges record wrong mergeinfo during conflicts'
* subversion/tests/cmdline/merge_tests.py
Author: pburba
Date: Fri Feb 1 18:15:59 2013
New Revision: 1441566
URL: http://svn.apache.org/viewvc?rev=1441566view=rev
Log:
Fix issue #4310 each editor drive gets its own notification during
'svn merge'.
* subversion/libsvn_client/merge.c
(do_file_merge): Reset the merge_b
Author: pburba
Date: Wed Jan 30 20:31:11 2013
New Revision: 1440653
URL: http://svn.apache.org/viewvc?rev=1440653view=rev
Log:
* subversion/libsvn_client/merge.c
(process_children_with_new_mergeinfo): Make a note about issue #4309
in the spot where we'll eventually fix it (but not anytime
Author: pburba
Date: Wed Jan 30 21:32:38 2013
New Revision: 1440682
URL: http://svn.apache.org/viewvc?rev=1440682view=rev
Log:
Stop producing duplicate mergeinfo notifications when a merge adds a
subtree with explicit mergeinfo on it.
* subversion/libsvn_client/merge.c
Author: pburba
Date: Wed Jan 30 22:53:48 2013
New Revision: 1440729
URL: http://svn.apache.org/viewvc?rev=1440729view=rev
Log:
Follow-up to r1440647. Account for the fact that issue #4309 'wrong
notification and bogus mergeinfo during merge which adds subtree with
mergeinfo' now rears its ugly
Author: pburba
Date: Sun Jan 27 03:44:56 2013
New Revision: 1439016
URL: http://svn.apache.org/viewvc?rev=1439016view=rev
Log:
* STATUS: Vote for issue #4306 group.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc
Author: pburba
Date: Fri Jan 25 17:27:55 2013
New Revision: 1438602
URL: http://svn.apache.org/viewvc?rev=1438602view=rev
Log:
* subversion/tests/cmdline/merge_tests.py
(conflict_aborted_mergeinfo_described_partial_merge): New test for
issue #4306 'multiple editor drive merges record wrong
1 - 100 of 838 matches
Mail list logo
