Remove the 'dummy merge range' merge logic. It's needlessly confusing, but more importantly it isn't necessary any more (unclear if it was …
Remove the 'dummy merge range' merge logic. It's needlessly confusing,but more importantly it isn't necessary any more (unclear if it was everreally needed).* subversion/libsvn_client/merge.c (merge_cmd_baton_t): Remove target_has_dummy_merge_range member. In the current merge code we can simply check the remaining_ranges member. If it is empty that is the same as target_has_dummy_merge_range being true, if it has ranges then it is the same as target_has_dummy_merge_range being false. (notification_receiver, drive_merge_report_editor): Don't check the merge baton's target_has_dummy_merge_range member, instead use its remaining_ranges member as described above. (populate_remaining_ranges): Don't bother putting a 'dummy' range with the same start and end revision in the merge target's remaining_ranges. It isn't necessary, plus it explicitly violates the rules for svn_merge_range_t start and end members. (do_merge): Remove target_has_dummy_merge_range initialization.