Plmerge takes an optional automatic_entries_file key, which distinguishes the automatic entries from the other plist files to be merged.

--
MOS_MIGRATED_REVID=109998193

1 files changed, 6 insertions, 0 deletions

diff --git a/src/main/protobuf/plmerge.proto b/src/main/protobuf/plmerge.proto
index d493a6f84b..0cfee922ab 100644
--- a/src/main/protobuf/plmerge.proto
+++ b/src/main/protobuf/plmerge.proto
@@ -19,10 +19,16 @@ option java_package = "com.google.devtools.build.xcode.plmerge.proto";
 
 // Contains necessary arguments for PlMerge, which is responsible for merging
 // plist files.
+// Next Id: 7
 message Control {
   // Paths to the plist files to merge relative to execution root.
   repeated string source_file = 1;
 
+  // Paths to plist files to merge relative to execution root.  Unlike
+  // source_file, these keys cannot be overwritten by other plists.
+  // Plmerge will throw an error if any of these keys occur more than once.
+  repeated string immutable_source_file = 6;
+
   // Path to the output file to merge relative to execution root.
   required string out_file = 2;