Author: rhuijben
Date: Tue Mar 27 14:34:36 2012
New Revision: 1305853
URL: http://svn.apache.org/viewvc?rev=1305853&view=rev
Log:
Following up on r1304614 and the buildbot XPass that resulted, fix an invalid
pointer usage.
* subversion/libsvn_client/merge.c
(compare_merge_source_ts): Use the right pointer type to retrieve the
revisions.
* subversion/tests/cmdline/merge_tests.py
(reverse_merge_with_rename): Remove XFail marker.
Review by: danielsh
(Who will review a few similar cases)
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/tests/cmdline/merge_tests.py
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1305853&r1=1305852&r2=1305853&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Mar 27 14:34:36 2012
@@ -6311,8 +6311,8 @@ static int
compare_merge_source_ts(const void *a,
const void *b)
{
- svn_revnum_t a_rev = ((const merge_source_t *)a)->loc1->rev;
- svn_revnum_t b_rev = ((const merge_source_t *)b)->loc1->rev;
+ svn_revnum_t a_rev = (*(const merge_source_t *const *)a)->loc1->rev;
+ svn_revnum_t b_rev = (*(const merge_source_t *const *)b)->loc1->rev;
if (a_rev == b_rev)
return 0;
return a_rev < b_rev ? 1 : -1;
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1305853&r1=1305852&r2=1305853&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Tue Mar 27
14:34:36 2012
@@ -17471,7 +17471,6 @@ def merge_source_with_replacement(sbox):
# Test for issue #4144 'Reverse merge with replace in source applies
# diffs in forward order'.
@SkipUnless(server_has_mergeinfo)
-@XFail()
@Issue(4144)
def reverse_merge_with_rename(sbox):
"reverse merge applies revs in reverse order"
