From dbf488c96dfc04370403e6503123d44f9410ab1e Mon Sep 17 00:00:00 2001 From: Nathaniel Catchpole Date: Wed, 9 Nov 2016 14:09:00 +0000 Subject: [PATCH] Issue #2818155 by Yogesh Pawar, edgewl2: Add comments to d6_file stating the conflicts with d6_user_picture_file --- core/modules/file/migration_templates/d6_file.yml | 3 +++ core/modules/user/migration_templates/d6_user_picture_file.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/core/modules/file/migration_templates/d6_file.yml b/core/modules/file/migration_templates/d6_file.yml index 0fdcd8403af..6df20b52278 100644 --- a/core/modules/file/migration_templates/d6_file.yml +++ b/core/modules/file/migration_templates/d6_file.yml @@ -13,6 +13,9 @@ source: # configuration in this migration's process pipeline as an example. source_base_path: '' process: + # If you are using both this migration and d6_user_picture_file in a custom + # migration and executing migrations incrementally, it is recommended that + # you remove the fid mapping here to avoid potential ID conflicts. fid: fid filename: filename source_full_path: diff --git a/core/modules/user/migration_templates/d6_user_picture_file.yml b/core/modules/user/migration_templates/d6_user_picture_file.yml index 3518d7a6e3b..d367f33b933 100644 --- a/core/modules/user/migration_templates/d6_user_picture_file.yml +++ b/core/modules/user/migration_templates/d6_user_picture_file.yml @@ -11,6 +11,9 @@ source: # table are specified, and must end with a /. source_base_path: '' process: + # If you are using both this migration and d6_file in a custom migration + # and executing migrations incrementally, it is recommended that you + # remove the fid mapping from d6_file to avoid potential ID conflicts. filename: filename uid: uid source_full_path: