[PATCH] D69282: [RFC] Add a VCS conflict marker format printing on tooling::ReplacementError

[Jeremy Demeule via Phabricator via cfe-commits]

jdemeule created this revision.
jdemeule added a reviewer: klimek.
Herald added subscribers: cfe-commits, jfb.
Herald added a project: clang.

Last year, I made some suggestion to improve conflict reporting in clang-apply-replacements (https://reviews.llvm.org/D43764).
I have a very simple implementation of a VCS conflict marker to share and get some feedbacks if this approach could get some interests.


Repository:
  rC Clang

https://reviews.llvm.org/D69282

Files:
  clang-tools-extra/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp
  clang-tools-extra/test/clang-apply-replacements/Inputs/conflict/expected.txt
  clang-tools-extra/test/clang-apply-replacements/Inputs/order-dependent/expected.txt
  clang/include/clang/Tooling/Core/Replacement.h
  clang/lib/Tooling/Core/Replacement.cpp
  clang/unittests/Tooling/RefactoringTest.cpp

-------------- next part --------------
A non-text attachment was scrubbed...
Name: D69282.225962.patch
Type: text/x-patch
Size: 23028 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20191021/ee9ad509/attachment-0001.bin>