From 2bc6f6985fffa5335fa927385c9103108ae50850 Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Tue, 5 Apr 2016 19:40:59 -0700 Subject: [PATCH] Add section about update in mapping.md [skip ci] --- docs/workflow/mapping.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/docs/workflow/mapping.md b/docs/workflow/mapping.md index 27a9b8e53..c0189b071 100644 --- a/docs/workflow/mapping.md +++ b/docs/workflow/mapping.md @@ -34,4 +34,23 @@ It supports `-WhatIf` switch. ``` +## Updating `mapping.json` + +If you are bringing new (that are not yet included) files from source-depot, you need to update `mapping.json` to include them. +This way, we can keep track of changes and have ability to integrate changes back to Source Depot. +We will use term **integrate** for that kind of new files. + +* Make a separate commit with update for `mapping.json`. Separate commit will help to manage this change in other branches. + +* You can use `Copy-SubmoduleFiles` function to copy files on disk. + +* Make a separate commit for integrated files. +Use `--author="PowerShell Team "` switch to indicate that it's a collective work. + +``` +git commit --author="PowerShell Team " +``` + +Use this approach for **test files** as well. +You can add them under `test` directory and include in CI test run, but keep the notion of integration in `mapping.json`.