[cfe-dev] FW: RFC: YAML as an intermediate format for clang::tooling::Replacement data on disk

[Vane, Edwin]

> -----Original Message-----
> From: Manuel Klimek [mailto:klimek at google.com]
> Sent: Wednesday, July 31, 2013 12:46 PM
> To: Du Toit, Stefanus
> Cc: Vane, Edwin; Daniel Jasper; Clang Dev List (cfe-dev at cs.uiuc.edu)
> Subject: Re: [cfe-dev] FW: RFC: YAML as an intermediate format for
> clang::tooling::Replacement data on disk
...
> "Merging" is usually merely deduplication, which is not hard. I have the feeling
> that you think there's lots of complexity where it isn't. I'd definitely say that the
> heuristics you propose in order to be able to process headers on their own are
> much higher than the issue of deduplicating edits.

Is it? Is it not possible for conflicts to occur? If so we must detect these conflicts for the user to sort out. Admittedly, migmerge_git approaches the merge problem from a contextual diff approach but it's the difficulty of detecting conflicts that made that approach so appealing in the first place.

> 
> Cheers,
> /Manuel