Author: julianfoad
Date: Wed Jun 3 21:18:18 2015
New Revision: 1683425
URL: http://svn.apache.org/r1683425
Log:
On the 'move-tracking-2' branch: Fix a missed conflict detection case.
* subversion/svnmover/svnmover.c
(element_merge): Don't overwrite the conflict detection flag.
Modified:
subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
Modified: subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c?rev=1683425&r1=1683424&r2=1683425&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
(original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Wed Jun
3 21:18:18 2015
@@ -1144,9 +1144,15 @@ element_merge(svn_branch_el_rev_content_
}
/* merge the payload */
- payload_merge(&result->payload, &conflict,
- eid, side1->payload, side2->payload, yca->payload,
- policy, result_pool, scratch_pool);
+ {
+ svn_boolean_t payload_conflict;
+
+ payload_merge(&result->payload, &payload_conflict,
+ eid, side1->payload, side2->payload, yca->payload,
+ policy, result_pool, scratch_pool);
+ if (payload_conflict)
+ conflict = TRUE;
+ }
}
else if (! side1 && ! side2)
{
