I (Julian Foad) wrote: > Summary: I plan to make 'svn merge' act on --accept=theirs|mine|etc. per > file, rather than (as it does now) postponing all conflicts until after the > whole merge and then resolving them. [...] > I think a good enough solution for 1.8 is this: [...] > * [...] let the resolver callback be active during the merge, resolving > each > conflict on a node immediately after that conflict has been raised, according > to > '--accept'.
A note: The issue can only occur for 'merge', and never for 'update' or 'switch' because those never need a multi-revision-range merge. Another thought: This solution deliberately leaves interactive resolution as a separate case. We do need to ensure that there is some workable solution available for interactive users hitting the same case (the problem case is: two successive changes to the same node, that both conflict). Ultimately I can't think of any alternative to running the merge one phase (rev range) at a time, resolving any conflicts produced during that phase at the end of that phase. When we achieve that, then the --accept=theirs kinds of resolution might as well work the same way, but I don't see us achieving that before 1.8, so I think we'll do something cruder; not sure what. - Julian
