[PATCH] D35753: llvm-mt: implement simple merging of manifests, not factoring namespaces.

[Eric Beckmann via Phabricator via llvm-commits]

ecbeckmann created this revision.
Herald added a subscriber: hiraditya.

Does a simple merge, where mergeable elements are combined, all others
are appended.  Does not apply trickly namespace rules.


https://reviews.llvm.org/D35753

Files:
  llvm/include/llvm/Support/WindowsManifestMerger.h
  llvm/lib/Support/WindowsManifestMerger.cpp
  llvm/test/tools/llvm-mt/Inputs/additional.manifest
  llvm/test/tools/llvm-mt/Inputs/conflicting.manifest
  llvm/test/tools/llvm-mt/Inputs/test_manifest.manifest
  llvm/test/tools/llvm-mt/conflicting.test
  llvm/test/tools/llvm-mt/simple_merge.test
  llvm/tools/llvm-mt/llvm-mt.cpp

-------------- next part --------------
A non-text attachment was scrubbed...
Name: D35753.107766.patch
Type: text/x-patch
Size: 11289 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170722/875cc9b8/attachment.bin>