Author: pburba
Date: Fri Jul 29 15:35:14 2011
New Revision: 1152267
URL: http://svn.apache.org/viewvc?rev=1152267view=rev
Log:
Add a test for issue #3975 'adds with explicit mergeinfo don't get mergeinfo
describing merge which added them'.
* subversion/tests/cmdline/merge_tests.py
Author: pburba
Date: Fri Jul 29 15:59:14 2011
New Revision: 1152286
URL: http://svn.apache.org/viewvc?rev=1152286view=rev
Log:
* subversion/tests/cmdline/merge_tests.py
(merge_adds_subtree_with_mergeinfo): Follow-up to r1152267, set to XFail,
issue #3975 is still open.
Modified
Author: pburba
Date: Mon Aug 1 14:45:44 2011
New Revision: 1152807
URL: http://svn.apache.org/viewvc?rev=1152807view=rev
Log:
* subversion/libsvn_client/merge.c
(get_mergeinfo_paths): Clarify that criteria 3 refers to a path's immediate
parent, not its nearest parent.
Modified
Author: pburba
Date: Mon Aug 1 14:47:07 2011
New Revision: 1152809
URL: http://svn.apache.org/viewvc?rev=1152809view=rev
Log:
* subversion/libsvn_client/merge.c
(record_mergeinfo_for_added_subtrees): Simplify doc string; just tell what
it does, rather than why it's being called.
Modified
Author: pburba
Date: Mon Aug 1 18:38:52 2011
New Revision: 1152889
URL: http://svn.apache.org/viewvc?rev=1152889view=rev
Log:
* subversion/tests/cmdline/merge_reintegrate_tests.py
(reintegrate_with_subtree_mergeinfo): Remove unnecessary expected_disk
variables where we use
Author: pburba
Date: Mon Aug 1 21:16:03 2011
New Revision: 1152931
URL: http://svn.apache.org/viewvc?rev=1152931view=rev
Log:
Create a branch for issue #3975 'adds with explicit mergeinfo don't get
mergeinfo describing merge which added them'.
Added:
subversion/branches/issue-3975/ (props
Author: pburba
Date: Mon Aug 1 21:29:51 2011
New Revision: 1152939
URL: http://svn.apache.org/viewvc?rev=1152939view=rev
Log:
On the issue-3975 branch add a BRANCH-README.
Added:
subversion/branches/issue-3975/BRANCH-README
Added: subversion/branches/issue-3975/BRANCH-README
URL:
http
Author: pburba
Date: Tue Aug 2 15:14:42 2011
New Revision: 1153160
URL: http://svn.apache.org/viewvc?rev=1153160view=rev
Log:
On the issue-3975 branch: If a merge adds a path with explicit mergeinfo,
then record mergeinfo on that path which describes the merge itself.
Note: This can result
Author: pburba
Date: Tue Aug 2 16:18:15 2011
New Revision: 1153180
URL: http://svn.apache.org/viewvc?rev=1153180view=rev
Log:
* subversion/libsvn_repos/log.c
(do_logs): Fix comment typo.
Modified:
subversion/trunk/subversion/libsvn_repos/log.c
Modified: subversion/trunk/subversion
Author: pburba
Date: Tue Aug 2 16:25:06 2011
New Revision: 1153181
URL: http://svn.apache.org/viewvc?rev=1153181view=rev
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
Author: pburba
Date: Tue Aug 2 16:47:05 2011
New Revision: 1153187
URL: http://svn.apache.org/viewvc?rev=1153187view=rev
Log:
* STATUS: Put r1153138 group back, I accidentally deleted it in r1153181.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL
Author: pburba
Date: Thu Aug 4 14:38:35 2011
New Revision: 1153890
URL: http://svn.apache.org/viewvc?rev=1153890view=rev
Log:
* STATUS: Vote for r1152140.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion
Author: pburba
Date: Thu Aug 4 14:41:52 2011
New Revision: 1153891
URL: http://svn.apache.org/viewvc?rev=1153891view=rev
Log:
* subversion/tests/cmdline/merge_tests.py
(merge_adds_subtree_with_mergeinfo): Fix a typo in the expected mergeinfo
for this (still) XFailing test.
Modified
Author: pburba
Date: Thu Aug 4 17:28:51 2011
New Revision: 1153942
URL: http://svn.apache.org/viewvc?rev=1153942view=rev
Log:
On the issue-3975 branch: Sync with ^/subversion/trunk.
Modified:
subversion/branches/issue-3975/ (props changed)
subversion/branches/issue-3975/build/ac
Author: pburba
Date: Thu Aug 4 20:55:47 2011
New Revision: 1154009
URL: http://svn.apache.org/viewvc?rev=1154009view=rev
Log:
Fix issue #3978 'Reverse merge which adds subtree fails'
* subversion/libsvn_client/merge.c
(record_mergeinfo_for_added_subtrees): Document and enforce
Author: pburba
Date: Fri Aug 5 15:39:10 2011
New Revision: 1154273
URL: http://svn.apache.org/viewvc?rev=1154273view=rev
Log:
Add a regression test for issue #3978 'Reverse merge which adds subtree
fails'.
* subversion/tests/cmdline/merge_tests.py
(reverse_merge_adds_subtree): New
Author: pburba
Date: Fri Aug 5 15:57:11 2011
New Revision: 1154279
URL: http://svn.apache.org/viewvc?rev=1154279view=rev
Log:
* STATUS: Nominate r1154009 and r1154273 for issue #3978 'Reverse merge
which adds subtree fails'.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion
Modified: subversion/branches/issue-3975/subversion/svnrdump/svnrdump.c
URL:
http://svn.apache.org/viewvc/subversion/branches/issue-3975/subversion/svnrdump/svnrdump.c?rev=1154351r1=1154350r2=1154351view=diff
==
---
Author: pburba
Date: Fri Aug 5 18:49:28 2011
New Revision: 1154351
URL: http://svn.apache.org/viewvc?rev=1154351view=rev
Log:
On the issue-3975 branch: Sync with ^/subversion/trunk.
Modified:
subversion/branches/issue-3975/ (props changed)
subversion/branches/issue-3975/build
Author: pburba
Date: Fri Aug 5 20:41:48 2011
New Revision: 1154375
URL: http://svn.apache.org/viewvc?rev=1154375view=rev
Log:
On the issue-3975 branch: When a merge adds a path with explicit mergeinfo,
don't record non-existent merge sources to describe the merge.
* subversion/libsvn_client
Author: pburba
Date: Wed Aug 10 18:51:10 2011
New Revision: 1156312
URL: http://svn.apache.org/viewvc?rev=1156312view=rev
Log:
Partial fix for issue #3986 'svn_client_mergeinfo_log API broken with WC
target which inherits mergeinfo from repos'.
* subversion/libsvn_client/mergeinfo.c
Author: pburba
Date: Thu Aug 11 18:31:29 2011
New Revision: 1156717
URL: http://svn.apache.org/viewvc?rev=1156717view=rev
Log:
Update test for issue #3986 'svn_client_mergeinfo_log API broken with WC
target which inherits mergeinfo from repos' to cover another failing use
case.
* subversion
Author: pburba
Date: Thu Aug 11 18:34:59 2011
New Revision: 1156721
URL: http://svn.apache.org/viewvc?rev=1156721view=rev
Log:
Follow-up to r1156717, remove some development commenting from the
issue #3986 test.
Modified:
subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py
Modified
Author: pburba
Date: Thu Aug 11 19:16:24 2011
New Revision: 1156750
URL: http://svn.apache.org/viewvc?rev=1156750view=rev
Log:
More fixes for issue #3986 'svn_client_mergeinfo_log API broken with WC
target which inherits mergeinfo from repos'.
Prior to this change
Author: pburba
Date: Thu Aug 11 20:57:22 2011
New Revision: 1156827
URL: http://svn.apache.org/viewvc?rev=1156827view=rev
Log:
Final fix for issue #3986 'svn_client_mergeinfo_log API broken
with WC target which inherits mergeinfo from repos'.
* subversion/libsvn_client/mergeinfo.c
Author: pburba
Revision: 1156216
Modified property: svn:log
Modified: svn:log at Thu Aug 11 21:16:41 2011
--
--- svn:log (original)
+++ svn:log Thu Aug 11 21:16:41 2011
@@ -1,5 +1,5 @@
-Add a test for issue #3986
Author: pburba
Revision: 1156312
Modified property: svn:log
Modified: svn:log at Thu Aug 11 21:17:07 2011
--
--- svn:log (original)
+++ svn:log Thu Aug 11 21:17:07 2011
@@ -1,5 +1,4 @@
-Partial fix for issue #3986
Author: pburba
Revision: 1156717
Modified property: svn:log
Modified: svn:log at Thu Aug 11 21:17:47 2011
--
--- svn:log (original)
+++ svn:log Thu Aug 11 21:17:47 2011
@@ -1,6 +1,5 @@
-Update test for issue #3986
Author: pburba
Revision: 1156750
Modified property: svn:log
Modified: svn:log at Thu Aug 11 21:18:18 2011
--
--- svn:log (original)
+++ svn:log Thu Aug 11 21:18:18 2011
@@ -1,5 +1,4 @@
-More fixes for issue #3986
Author: pburba
Revision: 1156827
Modified property: svn:log
Modified: svn:log at Thu Aug 11 21:18:29 2011
--
--- svn:log (original)
+++ svn:log Thu Aug 11 21:18:29 2011
@@ -1,5 +1,4 @@
-Final fix for issue #3986
Author: pburba
Date: Thu Aug 11 21:21:15 2011
New Revision: 1156838
URL: http://svn.apache.org/viewvc?rev=1156838view=rev
Log:
Update a comment for issue #3986 test.
Modified:
subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py
Modified: subversion/trunk/subversion/tests/cmdline
Author: pburba
Date: Thu Aug 11 21:54:11 2011
New Revision: 1156844
URL: http://svn.apache.org/viewvc?rev=1156844view=rev
Log:
* STATUS: Nominate issue #3986 fixes.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc
Author: pburba
Date: Tue Aug 16 18:47:39 2011
New Revision: 1158419
URL: http://svn.apache.org/viewvc?rev=1158419view=rev
Log:
Fix expectations for issue #3989 test.
* subversion/tests/cmdline/merge_tests.py
(merged_deletion_causes_tree_conflict): Correct expected mergeinfo.
Modified
Author: pburba
Date: Wed Aug 17 18:14:48 2011
New Revision: 1158854
URL: http://svn.apache.org/viewvc?rev=1158854view=rev
Log:
Follow-up to r961254: Fix issue #3989 'merge which deletes file with native
eol-style raises spurious tree conflict'.
* subversion/libsvn_client/client.h
Author: pburba
Date: Wed Aug 17 18:24:28 2011
New Revision: 1158859
URL: http://svn.apache.org/viewvc?rev=1158859view=rev
Log:
* STATUS: Nominate fix for issue #3989 (r1158407, r1158419, r1158854).
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL
Modified: subversion/branches/issue-3975/subversion/svn/status.c
URL:
http://svn.apache.org/viewvc/subversion/branches/issue-3975/subversion/svn/status.c?rev=1158860r1=1158859r2=1158860view=diff
==
---
Author: pburba
Date: Thu Aug 18 20:21:35 2011
New Revision: 1159403
URL: http://svn.apache.org/viewvc?rev=1159403view=rev
Log:
* subversion/tests/cmdline/merge_reintegrate_tests.py
(reintegrate_with_subtree_mergeinfo): Remove a meaningless comment which
originated with a cut-and-paste
Author: pburba
Date: Mon Aug 22 20:52:34 2011
New Revision: 1160427
URL: http://svn.apache.org/viewvc?rev=1160427view=rev
Log:
On the issue-3975 branch:
* subversion/tests/cmdline/merge_tests.py
(merge_adds_subtree_with_mergeinfo): Remove XFail decorator and comment.
This test was actually
Author: pburba
Date: Mon Aug 22 20:52:48 2011
New Revision: 1160428
URL: http://svn.apache.org/viewvc?rev=1160428view=rev
Log:
On the issue-3975 branch: Whitespace cleanup.
* subversion/libsvn_client/merge.c
(record_mergeinfo_for_added_subtrees): Clean up trailing from earlier
commit
Modified:
subversion/branches/issue-3975/subversion/tests/cmdline/upgrade_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/issue-3975/subversion/tests/cmdline/upgrade_tests.py?rev=1160699r1=1160698r2=1160699view=diff
Author: pburba
Date: Tue Aug 23 15:53:39 2011
New Revision: 1160756
URL: http://svn.apache.org/viewvc?rev=1160756view=rev
Log:
Reintegrate the issue #3975 'adds with explicit mergeinfo don't get
mergeinfo describing merge which added them' branch to trunk.
Modified:
subversion/trunk
Author: pburba
Date: Tue Aug 23 16:02:15 2011
New Revision: 1160761
URL: http://svn.apache.org/viewvc?rev=1160761view=rev
Log:
Create a 1.7.x backport branch for issue #3975.
Added:
subversion/branches/1.7.x-issue3975/ (props changed)
- copied from r1160760, subversion/branches/1.7.x
Author: pburba
Date: Tue Aug 23 16:33:44 2011
New Revision: 1160780
URL: http://svn.apache.org/viewvc?rev=1160780view=rev
Log:
On the 1.7.x-issue3975 branch: Merge r1152809 from ^/subversion/trunk.
r1152809 is a comment only change, made to avoid a text conflict when
merging the issue #3975
Author: pburba
Date: Tue Aug 23 16:47:54 2011
New Revision: 1160791
URL: http://svn.apache.org/viewvc?rev=1160791view=rev
Log:
On the 1.7.x-issue3975 branch: Merge r1152267 and r1152286 from
^/subversion/trunk.
r1152267 adds a test for issue #3975 and r1152286 sets the test as XFail.
Resolved
Author: pburba
Date: Tue Aug 23 16:54:34 2011
New Revision: 1160799
URL: http://svn.apache.org/viewvc?rev=1160799view=rev
Log:
On the 1.7.x-issue3975 branch: Merge r1160756 from ^/subversion/trunk.
r1160756 was the reintegration of the issue-3975 branch back to trunk.
Resolved some minor
Author: pburba
Date: Tue Aug 23 18:30:47 2011
New Revision: 1160836
URL: http://svn.apache.org/viewvc?rev=1160836view=rev
Log:
* STATUS: Nominate issue #3975 fixes.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc
Author: pburba
Date: Thu Aug 25 18:39:43 2011
New Revision: 1161683
URL: http://svn.apache.org/viewvc?rev=1161683view=rev
Log:
Add a test for issue #3976 'record-only merges which add new subtree
mergeinfo don't record mergeinfo describing merge'.
* subversion/tests/cmdline/merge_tests.py
Author: pburba
Date: Thu Aug 25 20:01:57 2011
New Revision: 1161721
URL: http://svn.apache.org/viewvc?rev=1161721view=rev
Log:
Fix issue #3976 'record-only merges which add new subtree mergeinfo don't
record mergeinfo describing merge'.
* subversion/libsvn_client/merge.c
(merge_props_changed
Author: pburba
Date: Thu Aug 25 20:06:38 2011
New Revision: 1161725
URL: http://svn.apache.org/viewvc?rev=1161725view=rev
Log:
Delete the issue #3975 branch. This work was reintegrated to
^/subversion/trunk in r1160756.
Removed:
subversion/branches/issue-3975/
Author: pburba
Date: Thu Aug 25 20:21:13 2011
New Revision: 1161731
URL: http://svn.apache.org/viewvc?rev=1161731view=rev
Log:
Create a 1.7.x backport branch for the issue #3976 fix.
Added:
subversion/branches/1.7.x-issue3976/ (props changed)
- copied from r1161730, subversion
Author: pburba
Date: Thu Aug 25 20:27:09 2011
New Revision: 1161735
URL: http://svn.apache.org/viewvc?rev=1161735view=rev
Log:
On the 1.7.x-issue-3976 branch: Merge r1161683 from ^/subversion/trunk.
Resolve some minor conflicts with test ordering.
Modified:
subversion/branches/1.7.x
Author: pburba
Date: Thu Aug 25 20:35:26 2011
New Revision: 1161738
URL: http://svn.apache.org/viewvc?rev=1161738view=rev
Log:
On the 1.7.x-issue-3976 branch: Merge r1161721 from ^/subversion/trunk.
Modified:
subversion/branches/1.7.x-issue3976/ (props changed)
subversion/branches/1.7
Author: pburba
Date: Thu Aug 25 22:04:25 2011
New Revision: 1161776
URL: http://svn.apache.org/viewvc?rev=1161776view=rev
Log:
* STATUS: Nominate issue #3976 record-only merges which add new subtree
mergeinfo don't record mergeinfo describing merge fixes.
Modified:
subversion/branches/1.7
Author: pburba
Date: Fri Aug 26 15:14:37 2011
New Revision: 1162136
URL: http://svn.apache.org/viewvc?rev=1162136view=rev
Log:
* subversion/tests/cmdline/merge_reintegrate_tests.py
(reintegrate_creates_bogus_mergeinfo): Comments should match code.
Modified:
subversion/trunk/subversion
Author: pburba
Date: Mon Aug 29 20:13:32 2011
New Revision: 1162974
URL: http://svn.apache.org/viewvc?rev=1162974view=rev
Log:
Fix issue #3867 'reintegrate merges create mergeinfo for non-existent paths'.
* subversion/libsvn_client/merge.c
(record_mergeinfo_for_dir_merge): Filter non-existent
Author: pburba
Date: Mon Aug 29 20:36:22 2011
New Revision: 1162989
URL: http://svn.apache.org/viewvc?rev=1162989view=rev
Log:
* STATUS: Nominate r1162974, the fix for issue #3867 'reintegrate merges
create mergeinfo for non-existent paths'.
Modified:
subversion/branches/1.7.x/STATUS
Author: pburba
Date: Mon Aug 29 20:48:11 2011
New Revision: 1162995
URL: http://svn.apache.org/viewvc?rev=1162995view=rev
Log:
Follow-up to r1162974. The fix for issue #3867 'reintegrate merges create
mergeinfo for non-existent paths' also fixes issue #3961 'reintegrate
merge of replaced source
Author: pburba
Date: Mon Aug 29 21:10:14 2011
New Revision: 1163008
URL: http://svn.apache.org/viewvc?rev=1163008view=rev
Log:
* STATUS: Nominate test for issue #3961 'reintegrate merge of replaced
source produces inaccurate mergeinfo' and add it to the issue #3867
group. The fix for issue
Author: pburba
Date: Tue Aug 30 14:51:44 2011
New Revision: 1163243
URL: http://svn.apache.org/viewvc?rev=1163243view=rev
Log:
Add a test for issue #3971 'svn mergeinfo shows natural history of added
subtrees as eligible'.
* subversion/tests/cmdline/mergeinfo_tests.py
Author: pburba
Date: Tue Aug 30 21:03:50 2011
New Revision: 1163383
URL: http://svn.apache.org/viewvc?rev=1163383view=rev
Log:
Fix issue #3791 'svn mergeinfo shows natural history of added subtrees as
eligible'.
* subversion/libsvn_client/mergeinfo.c
(find_nearest_ancestor): Add output
Author: pburba
Revision: 1163243
Modified property: svn:log
Modified: svn:log at Wed Aug 31 14:13:16 2011
--
--- svn:log (original)
+++ svn:log Wed Aug 31 14:13:16 2011
@@ -1,4 +1,4 @@
-Add a test for issue #3971 'svn
Author: pburba
Date: Wed Aug 31 14:45:14 2011
New Revision: 1163650
URL: http://svn.apache.org/viewvc?rev=1163650view=rev
Log:
* STATUS: Nominate fix for issue #3791 'svn mergeinfo shows natural history
of added subtrees as eligible'.
Modified:
subversion/branches/1.7.x/STATUS
Modified
Author: pburba
Date: Wed Aug 31 15:47:50 2011
New Revision: 1163672
URL: http://svn.apache.org/viewvc?rev=1163672view=rev
Log:
* subversion/libsvn_client/merge.c
(record_mergeinfo_for_dir_merge): No need to use MAX/MIN macros on revision
arguments to svn_client__get_history_as_mergeinfo
Author: pburba
Date: Wed Aug 31 20:20:07 2011
New Revision: 1163792
URL: http://svn.apache.org/viewvc?rev=1163792view=rev
Log:
Follow-up to issue #3975 fixes made in r1160756: Catch and clear a possible
error.
* subversion/libsvn_client/merge.c
(record_mergeinfo_for_dir_merge): Subtrees
Author: pburba
Date: Wed Aug 31 20:45:05 2011
New Revision: 1163811
URL: http://svn.apache.org/viewvc?rev=1163811view=rev
Log:
* STATUS: Nominate a follow-up (r1163792) to the previously backported
issue #3975 fixes.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches
Author: pburba
Date: Fri Sep 2 17:22:03 2011
New Revision: 1164645
URL: http://svn.apache.org/viewvc?rev=1164645view=rev
Log:
Fix issue #3999 'svn merge with bad option or target segfaults'.
* subversion/libsvn_client/cmdline.c
(check_root_url_of_target): Instead of segfaulting, do
Author: pburba
Date: Tue Sep 6 15:23:11 2011
New Revision: 1165713
URL: http://svn.apache.org/viewvc?rev=1165713view=rev
Log:
Tweak test for issue #3707 'property conflicts not handled correctly by svn
resolve' so it fails due to issue #3707.
* subversion/tests/cmdline/resolve_tests.py
Author: pburba
Date: Tue Sep 6 16:12:23 2011
New Revision: 1165742
URL: http://svn.apache.org/viewvc?rev=1165742view=rev
Log:
Associate an existing XFail test with issue #3796 'svn switch to URL
requires access to URL's parent'.
* subversion/tests/cmdline/authz_tests.py
Author: pburba
Date: Wed Sep 7 15:35:20 2011
New Revision: 1166229
URL: http://svn.apache.org/viewvc?rev=1166229view=rev
Log:
Add a test for issue #4011 'merge of replacement on local delete fails'.
* subversion/tests/cmdline/merge_tree_conflict_tests.py
(merge_replace_on_del_fails): New
Author: pburba
Date: Wed Sep 21 13:43:01 2011
New Revision: 1173639
URL: http://svn.apache.org/viewvc?rev=1173639view=rev
Log:
Follow-up to the revert of issue #3669 in r1173425: Revert parts of r1036078
which were not already reverted in r1173425.
* subversion/libsvn_fs/fs-loader.h
Author: pburba
Date: Thu Sep 22 16:34:18 2011
New Revision: 1174246
URL: http://svn.apache.org/viewvc?rev=1174246view=rev
Log:
* STATUS: Cast some votes and make a note that the r1173425 has an associated
issue.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7
Author: pburba
Date: Fri Sep 23 14:23:20 2011
New Revision: 1174797
URL: http://svn.apache.org/viewvc?rev=1174797view=rev
Log:
Revert a small part of the issue #3668 and issue #3669 fixes that escaped
the reversion of those same fixes in r1173425 -- see
http://svn.haxx.se/dev/archive-2011-09/0495
Author: pburba
Date: Fri Sep 23 14:33:03 2011
New Revision: 1174813
URL: http://svn.apache.org/viewvc?rev=1174813view=rev
Log:
* STATUS: Add 1174797 to the r1173425 (Issue #4013) group.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http
Author: pburba
Date: Mon Sep 26 15:15:21 2011
New Revision: 1175903
URL: http://svn.apache.org/viewvc?rev=1175903view=rev
Log:
Rev svn_mergeinfo_merge API to use the two-pool paradigm.
* subversion/include/svn_mergeinfo.h
(svn_mergeinfo_merge2): New.
(svn_mergeinfo_merge): Deprecated
Author: pburba
Date: Mon Sep 26 16:28:53 2011
New Revision: 1175938
URL: http://svn.apache.org/viewvc?rev=1175938view=rev
Log:
Move some deprecated API implementations to deprecated.c.
* subversion/libsvn_subr/mergeinfo.c
(svn_mergeinfo_intersect,
svn_mergeinfo_remove): Move these from
Author: pburba
Date: Tue Sep 27 15:58:34 2011
New Revision: 1176447
URL: http://svn.apache.org/viewvc?rev=1176447view=rev
Log:
On the 1.7.x-r1173425 branch: Whitespace cleanup.
* subversion/libsvn_client/mergeinfo.c
* subversion/libsvn_client/mergeinfo.h
* subversion/libsvn_fs/fs-loader.c
Author: pburba
Date: Fri Oct 7 19:00:40 2011
New Revision: 1180154
URL: http://svn.apache.org/viewvc?rev=1180154view=rev
Log:
Tweak the svn_rangelist_merge2 API so it allocates new svn_merge_range_t
elements only when absolutely necessary.
This addresses a serious inefficiency in memory usage
Author: pburba
Date: Mon Oct 10 17:44:24 2011
New Revision: 1181093
URL: http://svn.apache.org/viewvc?rev=1181093view=rev
Log:
Create a branch for work on the reopened issues #3668 'inheritance can
result in self-referential mergeinfo' and issue #3669 'inheritance can
result in mergeinfo
Author: pburba
Date: Mon Oct 10 18:16:25 2011
New Revision: 1181110
URL: http://svn.apache.org/viewvc?rev=1181110view=rev
Log:
* subversion/include/svn_sorts.h
(svn_sort__array_delete): Fix documentation typo.
Modified:
subversion/trunk/subversion/include/svn_sorts.h
Modified: subversion
Author: pburba
Date: Mon Oct 10 20:22:06 2011
New Revision: 1181215
URL: http://svn.apache.org/viewvc?rev=1181215view=rev
Log:
The *rest* of r1181090!
* subversion/libsvn_subr/sorts.c
(svn_sort__array_delete): Don't assume we are only removing one element;
since r1181090 we may remove
Author: pburba
Date: Tue Oct 11 21:48:08 2011
New Revision: 1182108
URL: http://svn.apache.org/viewvc?rev=1182108view=rev
Log:
Add a test for issue #4022 'svn log -g interprets change in inherited
mergeinfo due to move as a merge'.
* subversion/tests/cmdline/log_tests.py
Author: pburba
Date: Tue Oct 11 22:23:37 2011
New Revision: 1182126
URL: http://svn.apache.org/viewvc?rev=1182126view=rev
Log:
Remove unreferenced and intialized but unreferenced variables.
* subversion/libsvn_fs/fs-loader.c
(svn_fs_verify):
* subversion/libsvn_subr/cache-membuffer.c
Author: pburba
Date: Tue Oct 11 22:33:44 2011
New Revision: 1182128
URL: http://svn.apache.org/viewvc?rev=1182128view=rev
Log:
* subversion/libsvn_subr/cache-membuffer.c
(membuffer_cache_set_internal): Fix a 'must return a value' warning.
Modified:
subversion/trunk/subversion/libsvn_subr
Author: pburba
Date: Tue Oct 18 14:42:03 2011
New Revision: 1185693
URL: http://svn.apache.org/viewvc?rev=1185693view=rev
Log:
* subversion/include/svn_mergeinfo.h
(svn_mergeinfo_merge2): Clarify how the result pool is used.
Modified:
subversion/trunk/subversion/include/svn_mergeinfo.h
Author: pburba
Date: Wed Oct 19 00:59:23 2011
New Revision: 1185936
URL: http://svn.apache.org/viewvc?rev=1185936view=rev
Log:
* STATUS: Cast a bunch of votes.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc
Author: pburba
Date: Wed Oct 19 14:01:42 2011
New Revision: 1186224
URL: http://svn.apache.org/viewvc?rev=1186224view=rev
Log:
Create a 1.7.x backport branch for the r1180154 group.
Added:
subversion/branches/1.7.x-r1180154/ (props changed)
- copied from r1186223, subversion/branches
Author: pburba
Date: Wed Oct 19 14:57:54 2011
New Revision: 1186252
URL: http://svn.apache.org/viewvc?rev=1186252view=rev
Log:
On the 1.7.x-r1180154 branch: Merge r1180154 from trunk.
* src-branch-1.7.x
Mergeinfo change only.
* subversion/include/svn_sorts.h
* subversion/libsvn_client/merge.c
Author: pburba
Date: Wed Oct 19 15:10:59 2011
New Revision: 1186259
URL: http://svn.apache.org/viewvc?rev=1186259view=rev
Log:
On the 1.7.x-r1180154 branch: Merge r1181090, r1181110, and r1181215 from
trunk -- No conflicts.
Modified:
subversion/branches/1.7.x-r1180154/ (props changed
Author: pburba
Date: Wed Oct 19 15:39:56 2011
New Revision: 1186279
URL: http://svn.apache.org/viewvc?rev=1186279view=rev
Log:
* STATUS: Nominate the r1180154 group.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc
Author: pburba
Revision: 1186252
Modified property: svn:log
Modified: svn:log at Wed Oct 19 18:58:02 2011
--
--- svn:log (original)
+++ svn:log Wed Oct 19 18:58:02 2011
@@ -10,11 +10,18 @@ On the 1.7.x-r1180154 branch
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:
http://svn.apache.org/viewvc/subversion
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:
subversion
Author: pburba
Date: Mon Oct 24 19:37:00 2011
New Revision: 1188329
URL: http://svn.apache.org/viewvc?rev=1188329view=rev
Log:
Fix issue #4022 'svn log -g interprets change in inherited mergeinfo due
to move as a merge'.
* subversion/include/svn_fs.h
(svn_fs_get_mergeinfo2): New
Author: pburba
Revision: 1188609
Modified property: svn:log
Modified: svn:log at Wed Oct 26 12:30:10 2011
--
--- svn:log (original)
+++ svn:log Wed Oct 26 12:30:10 2011
@@ -4,4 +4,4 @@
* build/generator/templates
Author: pburba
Date: Mon Oct 31 19:58:28 2011
New Revision: 1195639
URL: http://svn.apache.org/viewvc?rev=1195639view=rev
Log:
* STATUS: Cast some votes for 1.7.2.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc
Author: pburba
Date: Tue Nov 1 16:08:02 2011
New Revision: 1196078
URL: http://svn.apache.org/viewvc?rev=1196078view=rev
Log:
* subversion/svn/main.c
(svn_cl__options): Tweak help text to note that -c/--change option accepts
arguments in the ARG1-ARG2 form.
Modified:
subversion/trunk
Author: pburba
Date: Fri Nov 11 22:12:47 2011
New Revision: 1201071
URL: http://svn.apache.org/viewvc?rev=1201071view=rev
Log:
Add new tests for issue #4056 don't record non-inheritable mergeinfo if
missing subtrees are not touched by the full-depth diff and issue #4057
don't record non
Author: pburba
Date: Fri Nov 11 22:14:20 2011
New Revision: 1201072
URL: http://svn.apache.org/viewvc?rev=1201072view=rev
Log:
Add new tests for issue #4050 'svn mergeinfo' always considers
non-inheritable ranges as partially merged.
* subversion/tests/cmdline/mergeinfo_tests.py
1 - 100 of 838 matches
Mail list logo
