r867538 | dlr | 2007-10-29 18:59:33 +0000 (Mon, 29 Oct 2007)
Fix issue #2994, avoiding revision filtering when merging into a WC
using a different repository as the merge source.
(calculate_remaining_ranges): Add a new SAME_REPOS parameter, and
use it to conditionalize calls to filter_reflected_revisions() and
filter_merged_revisions(). When the WC doesn't correspond to the
repository used as the merge source, merge all requested revisions.
(populate_remaining_ranges, do_single_file_merge): Update calls to
calculate_remaining_ranges() for its new parameter.
Found by: Matthias Bendewald