[SVN-3032] merge from a renamed branch fails while avoiding repeat merges from renamed path

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: ---
• Fix Version/s: 1.5.0
• Component/s: libsvn_client
• Assignee: Unassigned
• Reporter: Subversion Importer
• Created: 28/Nov/07 06:56
• Updated: 27/Oct/18 16:33
• Resolved: 10/Mar/09 15:22

Description

<snip from subversion/libsvn_client/merge.c in do_directory_merge>
     while (end_rev != SVN_INVALID_REVNUM)
        {
          svn_revnum_t next_end_rev;
          svn_pool_clear(iterpool);

          /* Use persistent pool while playing with remaining_ranges. */
          slice_remaining_ranges(children_with_mergeinfo, is_rollback,
                                 end_rev, pool);
          notify_b->cur_ancestor_index = -1;
          SVN_ERR(drive_merge_report_editor(merge_b->target,
                                            url1, start_rev, url2, end_rev,
                                            children_with_mergeinfo,
                                            is_rollback,
                                            depth, notify_b, adm_access,
                                            &merge_callbacks, merge_b,
                                            iterpool));

</snip>

In the above snip we use same url1 and url2 even though they correspond to
revision1 and revision2 only for each run. It may be incorrect for start_rev and
end_rev.

Original issue reported by kameshj