"Alex Riesen" <raa.lkml@xxxxxxxxx> writes: > On 6/27/06, Junio C Hamano <junkio@xxxxxxx> wrote: >> -- >8 -- >> Notes on diffcore API >> ===================== > > Thanks! > >> Diffcore Transformation >> ----------------------- >> >> The input file pairs recorded in the previous phase are >> collected in diff_queued_diff (a global variable -- which means >> that you cannot have two diffs running in parallel with the >> current setup). This is an expandable array of pointers to >> `struct diff_filepair` structure. >> > > merge-recursive shouldn't have any problems with that, as the > renames are just read in the current implementation. > Still, it is somehow uncomfortable to see the amount of APIs > with the above restriction. Never know when it'll bite. I think it is simply the matter of moving diff_queued_diff a field in diff_optionss structure and adding an extra parameter to point at the current diff_options to handful functions if we ever need to support it. I haven't bothered doing that because we haven't had the need to run more than one diff at once. - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html