From 400ae53a969924e5a56b1c81c9ae6af157faa64f Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Fri, 14 Jun 2024 04:05:48 +0200 Subject: [PATCH 01/18] Simplified scripts for snapping subfolders to jb-main --- scripts/snap/Readme.txt | 7 ++++++ scripts/{ => snap/impl}/mergeEmpty.sh | 4 +++- scripts/snap/impl/snapSubfolder.sh | 31 +++++++++++++++++++++++++++ scripts/snap/impl/snapToJbMain.sh | 27 +++++++++++++++++++++++ scripts/snap/snapAnnotation.sh | 1 + scripts/snap/snapCollection.sh | 1 + scripts/snap/snapCompose.sh | 1 + scripts/snap/snapComposeMaterial3.sh | 1 + scripts/snap/snapLifecycle.sh | 1 + scripts/snap/snapMaterial3.sh | 1 + scripts/snap/snapNavigation.sh | 1 + scripts/snap/snapSavedstate.sh | 1 + scripts/snapSubfolder.sh | 28 ------------------------ 13 files changed, 76 insertions(+), 29 deletions(-) create mode 100644 scripts/snap/Readme.txt rename scripts/{ => snap/impl}/mergeEmpty.sh (78%) create mode 100755 scripts/snap/impl/snapSubfolder.sh create mode 100755 scripts/snap/impl/snapToJbMain.sh create mode 100755 scripts/snap/snapAnnotation.sh create mode 100755 scripts/snap/snapCollection.sh create mode 100755 scripts/snap/snapCompose.sh create mode 100755 scripts/snap/snapComposeMaterial3.sh create mode 100755 scripts/snap/snapLifecycle.sh create mode 100755 scripts/snap/snapMaterial3.sh create mode 100755 scripts/snap/snapNavigation.sh create mode 100755 scripts/snap/snapSavedstate.sh delete mode 100755 scripts/snapSubfolder.sh diff --git a/scripts/snap/Readme.txt b/scripts/snap/Readme.txt new file mode 100644 index 0000000000000..6f9514cab1558 --- /dev/null +++ b/scripts/snap/Readme.txt @@ -0,0 +1,7 @@ +The purposes of these scripts is to merge some subfolder to jb-main branch from other branch (usually it is "integration" or "integration-release/something"). + +The HEAD should be on the commit which you want to merge. + +It creates 2 branches: +- integration-snap/to-jb-main/$hash - should be merged to jb-main. It is created from the merging currentCommit to merge-base(currentCommit, jb-main) +- integration-snap/to-integration/$hash - should be merged to integration, to avoid conflicts in future merges of jb-main. It is createad as "empty" merge of "to-jb-main" to merge-base(currentCommit, integration) diff --git a/scripts/mergeEmpty.sh b/scripts/snap/impl/mergeEmpty.sh similarity index 78% rename from scripts/mergeEmpty.sh rename to scripts/snap/impl/mergeEmpty.sh index 274b584d7534a..c43291efa2f8c 100755 --- a/scripts/mergeEmpty.sh +++ b/scripts/snap/impl/mergeEmpty.sh @@ -1,5 +1,7 @@ #!/bin/bash +## !!! Be careful using this script separately from the main scripts in the parent folder +## ## This script merges a commit with discarding all the changes in it. ## It is useful when you don't want to merge some changes, but want to change a base commit, solving all future conflicts. @@ -12,7 +14,7 @@ fi COMMIT=$1 -ROOT_DIR="$(dirname "$0")/.." +ROOT_DIR="$(dirname "$0")/../../.." ( cd $ROOT_DIR; diff --git a/scripts/snap/impl/snapSubfolder.sh b/scripts/snap/impl/snapSubfolder.sh new file mode 100755 index 0000000000000..3f75418a3dad9 --- /dev/null +++ b/scripts/snap/impl/snapSubfolder.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +## !!! Be careful using this script separately from the main scripts in the parent folder +## +## This script set the state of a subfolder to the state in some commit, creating a merge commit. +## Warning!!! Snapping subfolders breaks the base commit and future merges of the destination branch. To fix it, merge the destination branch back to the source branch, discarding all changes. + +set -e + +if [ -z "$1" ]; then +echo "Specify the snapping commit and the subfolders. For example: ./snapSubfolder.sh androidx/compose-ui/1.6.0-alpha02 compose ':(exclude)compose/material3'" +exit 1 +fi + +if [ -z "$2" ]; then +echo "Specify the snapping commit and the subfolders. For example: ./snapSubfolder.sh androidx/compose-ui/1.6.0-alpha02 compose ':(exclude)compose/material3'" +exit 1 +fi + +COMMIT=$1 +FIRST_FOLDER=$2 +ALL_FOLDERS=${@:2} + +ROOT_DIR="$(dirname "$0")/../../.." + +( + cd $ROOT_DIR; + git checkout --no-overlay $COMMIT -- $ALL_FOLDERS; + NEW_COMMIT=$(git commit-tree -p HEAD -p $COMMIT -m"Snap $COMMIT, subfolder $FIRST_FOLDER" $(git write-tree)); + git reset --hard $NEW_COMMIT; +) diff --git a/scripts/snap/impl/snapToJbMain.sh b/scripts/snap/impl/snapToJbMain.sh new file mode 100755 index 0000000000000..9e1423c905bff --- /dev/null +++ b/scripts/snap/impl/snapToJbMain.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +set -e + +if [ -z "$1" ]; then +echo "Specify the snapping subfolder. For example: ./snapToJbMain.sh androidx/compose-ui/1.6.0-alpha02 compose ':(exclude)compose/material3'" +exit 1 +fi + +DIR=$(dirname "$0") +ALL_FOLDERS=${@:1} +CURRENT_COMMIT=$(git rev-parse --short @) +BRANCH_TO_RESTORE_IN_THE_END=$(git branch --show-current) + + +TO_JB_MAIN_BRANCH=integration-snap/to-jb-main/$CURRENT_COMMIT +git checkout --quiet $(git merge-base $CURRENT_COMMIT origin/jb-main) -B $TO_JB_MAIN_BRANCH +$DIR/snapSubfolder.sh $CURRENT_COMMIT $ALL_FOLDERS +echo "Created $TO_JB_MAIN_BRANCH" + +TO_INTEGRATION_BRANCH=integration-snap/to-integration/$CURRENT_COMMIT +git checkout --quiet $(git merge-base $CURRENT_COMMIT origin/integration) -B $TO_INTEGRATION_BRANCH +$DIR/mergeEmpty.sh $TO_JB_MAIN_BRANCH +echo "Created $TO_INTEGRATION_BRANCH" + + +git checkout --quiet $BRANCH_TO_RESTORE_IN_THE_END \ No newline at end of file diff --git a/scripts/snap/snapAnnotation.sh b/scripts/snap/snapAnnotation.sh new file mode 100755 index 0000000000000..1d77940591ce3 --- /dev/null +++ b/scripts/snap/snapAnnotation.sh @@ -0,0 +1 @@ +$(dirname "$0")/impl/snapToJbMain.sh 'compose/annotation' \ No newline at end of file diff --git a/scripts/snap/snapCollection.sh b/scripts/snap/snapCollection.sh new file mode 100755 index 0000000000000..53774d240983c --- /dev/null +++ b/scripts/snap/snapCollection.sh @@ -0,0 +1 @@ +$(dirname "$0")/impl/snapToJbMain.sh 'compose/collection' \ No newline at end of file diff --git a/scripts/snap/snapCompose.sh b/scripts/snap/snapCompose.sh new file mode 100755 index 0000000000000..2248fe68b1d90 --- /dev/null +++ b/scripts/snap/snapCompose.sh @@ -0,0 +1 @@ +$(dirname "$0")/impl/snapToJbMain.sh 'compose' ':(exclude)compose/material3' \ No newline at end of file diff --git a/scripts/snap/snapComposeMaterial3.sh b/scripts/snap/snapComposeMaterial3.sh new file mode 100755 index 0000000000000..036a000c0007f --- /dev/null +++ b/scripts/snap/snapComposeMaterial3.sh @@ -0,0 +1 @@ +$(dirname "$0")/impl/snapToJbMain.sh 'compose/material3' \ No newline at end of file diff --git a/scripts/snap/snapLifecycle.sh b/scripts/snap/snapLifecycle.sh new file mode 100755 index 0000000000000..43b4eb32e5593 --- /dev/null +++ b/scripts/snap/snapLifecycle.sh @@ -0,0 +1 @@ +$(dirname "$0")/impl/snapToJbMain.sh 'compose/lifecycle' \ No newline at end of file diff --git a/scripts/snap/snapMaterial3.sh b/scripts/snap/snapMaterial3.sh new file mode 100755 index 0000000000000..036a000c0007f --- /dev/null +++ b/scripts/snap/snapMaterial3.sh @@ -0,0 +1 @@ +$(dirname "$0")/impl/snapToJbMain.sh 'compose/material3' \ No newline at end of file diff --git a/scripts/snap/snapNavigation.sh b/scripts/snap/snapNavigation.sh new file mode 100755 index 0000000000000..7fe5e0be677f6 --- /dev/null +++ b/scripts/snap/snapNavigation.sh @@ -0,0 +1 @@ +$(dirname "$0")/impl/snapToJbMain.sh 'compose/navigation' \ No newline at end of file diff --git a/scripts/snap/snapSavedstate.sh b/scripts/snap/snapSavedstate.sh new file mode 100755 index 0000000000000..d0ec854465199 --- /dev/null +++ b/scripts/snap/snapSavedstate.sh @@ -0,0 +1 @@ +$(dirname "$0")/impl/snapToJbMain.sh 'compose/savedstate' \ No newline at end of file diff --git a/scripts/snapSubfolder.sh b/scripts/snapSubfolder.sh deleted file mode 100755 index 8e73a60970f55..0000000000000 --- a/scripts/snapSubfolder.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -## This script set the state of a subfolder to the state in some commit, creating a merge commit. -## Warning!!! Snapping subfolders breaks the base commit and future merges of the destination branch. To fix it, merge the destination branch back to the source branch, discarding all changes. - -set -e - -if [ -z "$1" ]; then -echo "Specify the snapping commit and the subfolder. For example: ./snapSubfolder.sh androidx/compose-material3/1.2.0-alpha02 compose/material3/material3" -exit 1 -fi - -if [ -z "$2" ]; then -echo "Specify the snapping commit and the subfolder. For example: ./snapSubfolder.sh androidx/compose-material3/1.2.0-alpha02 compose/material3/material3" -exit 1 -fi - -COMMIT=$1 -FOLDER=$2 - -ROOT_DIR="$(dirname "$0")/.." - -( - cd $ROOT_DIR; - git checkout --no-overlay $COMMIT -- $FOLDER; - NEW_COMMIT=$(git commit-tree -p HEAD -p $COMMIT -m"Snap $COMMIT, subfolder $FOLDER" $(git write-tree)); - git reset --hard $NEW_COMMIT; -) From 34e8fe91bfd7f5f18b4c009f355dd0f3cc71783d Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Fri, 14 Jun 2024 04:32:39 +0200 Subject: [PATCH 02/18] Rename branches --- scripts/snap/impl/snapToJbMain.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/snap/impl/snapToJbMain.sh b/scripts/snap/impl/snapToJbMain.sh index 9e1423c905bff..3d499c32df80e 100755 --- a/scripts/snap/impl/snapToJbMain.sh +++ b/scripts/snap/impl/snapToJbMain.sh @@ -13,12 +13,12 @@ CURRENT_COMMIT=$(git rev-parse --short @) BRANCH_TO_RESTORE_IN_THE_END=$(git branch --show-current) -TO_JB_MAIN_BRANCH=integration-snap/to-jb-main/$CURRENT_COMMIT +TO_JB_MAIN_BRANCH=integration-snap/$CURRENT_COMMIT/to-jb-main git checkout --quiet $(git merge-base $CURRENT_COMMIT origin/jb-main) -B $TO_JB_MAIN_BRANCH $DIR/snapSubfolder.sh $CURRENT_COMMIT $ALL_FOLDERS echo "Created $TO_JB_MAIN_BRANCH" -TO_INTEGRATION_BRANCH=integration-snap/to-integration/$CURRENT_COMMIT +TO_INTEGRATION_BRANCH=integration-snap/$CURRENT_COMMIT/to-integration git checkout --quiet $(git merge-base $CURRENT_COMMIT origin/integration) -B $TO_INTEGRATION_BRANCH $DIR/mergeEmpty.sh $TO_JB_MAIN_BRANCH echo "Created $TO_INTEGRATION_BRANCH" From ab5c88b1eec21ff8cfca31e47553a04ac21a5483 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Fri, 14 Jun 2024 04:33:10 +0200 Subject: [PATCH 03/18] Readme --- scripts/snap/Readme.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/snap/Readme.txt b/scripts/snap/Readme.txt index 6f9514cab1558..cef068b7d902a 100644 --- a/scripts/snap/Readme.txt +++ b/scripts/snap/Readme.txt @@ -3,5 +3,5 @@ The purposes of these scripts is to merge some subfolder to jb-main branch from The HEAD should be on the commit which you want to merge. It creates 2 branches: -- integration-snap/to-jb-main/$hash - should be merged to jb-main. It is created from the merging currentCommit to merge-base(currentCommit, jb-main) -- integration-snap/to-integration/$hash - should be merged to integration, to avoid conflicts in future merges of jb-main. It is createad as "empty" merge of "to-jb-main" to merge-base(currentCommit, integration) +- integration-snap/$hash/to-jb-main - should be merged to jb-main. It is created from the merging currentCommit to merge-base(currentCommit, jb-main) +- integration-snap/$hash/to-integration - should be merged to integration, to avoid conflicts in future merges of jb-main. It is createad as "empty" merge of "to-jb-main" to merge-base(currentCommit, integration) From 9744df17cea2e778fd2c1a4d9c844abcc1dcafe0 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Mon, 1 Jul 2024 14:36:44 +0200 Subject: [PATCH 04/18] Update scripts/snap/snapNavigation.sh Co-authored-by: Ivan Matkov --- scripts/snap/snapNavigation.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/snap/snapNavigation.sh b/scripts/snap/snapNavigation.sh index 7fe5e0be677f6..561efbda3eb7a 100755 --- a/scripts/snap/snapNavigation.sh +++ b/scripts/snap/snapNavigation.sh @@ -1 +1 @@ -$(dirname "$0")/impl/snapToJbMain.sh 'compose/navigation' \ No newline at end of file +$(dirname "$0")/impl/snapToJbMain.sh 'navigation' \ No newline at end of file From 2c25c297a7291972fd5446a17900399297e0721d Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Mon, 1 Jul 2024 14:36:52 +0200 Subject: [PATCH 05/18] Update scripts/snap/snapSavedstate.sh Co-authored-by: Ivan Matkov --- scripts/snap/snapSavedstate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/snap/snapSavedstate.sh b/scripts/snap/snapSavedstate.sh index d0ec854465199..0a623942be4c0 100755 --- a/scripts/snap/snapSavedstate.sh +++ b/scripts/snap/snapSavedstate.sh @@ -1 +1 @@ -$(dirname "$0")/impl/snapToJbMain.sh 'compose/savedstate' \ No newline at end of file +$(dirname "$0")/impl/snapToJbMain.sh 'savedstate' \ No newline at end of file From afb92d9bf7f4647126394f6b4ce8457a9a612c8d Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Mon, 1 Jul 2024 14:36:56 +0200 Subject: [PATCH 06/18] Update scripts/snap/snapAnnotation.sh Co-authored-by: Ivan Matkov --- scripts/snap/snapAnnotation.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/snap/snapAnnotation.sh b/scripts/snap/snapAnnotation.sh index 1d77940591ce3..af386b2a141ee 100755 --- a/scripts/snap/snapAnnotation.sh +++ b/scripts/snap/snapAnnotation.sh @@ -1 +1 @@ -$(dirname "$0")/impl/snapToJbMain.sh 'compose/annotation' \ No newline at end of file +$(dirname "$0")/impl/snapToJbMain.sh 'annotation' \ No newline at end of file From 4faab27f44da6218390e03eb8d5df31e44ba53a3 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Mon, 1 Jul 2024 14:37:03 +0200 Subject: [PATCH 07/18] Update scripts/snap/snapLifecycle.sh Co-authored-by: Ivan Matkov --- scripts/snap/snapLifecycle.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/snap/snapLifecycle.sh b/scripts/snap/snapLifecycle.sh index 43b4eb32e5593..aaa7605432ef7 100755 --- a/scripts/snap/snapLifecycle.sh +++ b/scripts/snap/snapLifecycle.sh @@ -1 +1 @@ -$(dirname "$0")/impl/snapToJbMain.sh 'compose/lifecycle' \ No newline at end of file +$(dirname "$0")/impl/snapToJbMain.sh 'lifecycle' \ No newline at end of file From 4757e326b98e9eaa4bebce59f92af7f0c0905aa2 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Mon, 1 Jul 2024 14:37:08 +0200 Subject: [PATCH 08/18] Update scripts/snap/snapCollection.sh Co-authored-by: Ivan Matkov --- scripts/snap/snapCollection.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/snap/snapCollection.sh b/scripts/snap/snapCollection.sh index 53774d240983c..b2f3c8edbe4e0 100755 --- a/scripts/snap/snapCollection.sh +++ b/scripts/snap/snapCollection.sh @@ -1 +1 @@ -$(dirname "$0")/impl/snapToJbMain.sh 'compose/collection' \ No newline at end of file +$(dirname "$0")/impl/snapToJbMain.sh 'collection' \ No newline at end of file From c3fc8d6780fb7ae0976322fea1350c66a2349169 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Mon, 17 Jun 2024 01:26:02 +0200 Subject: [PATCH 09/18] Discussions --- scripts/snap/Readme.txt | 10 ++++++---- scripts/snap/impl/snapToJbMain.sh | 8 +++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/scripts/snap/Readme.txt b/scripts/snap/Readme.txt index cef068b7d902a..827b1d3c551c6 100644 --- a/scripts/snap/Readme.txt +++ b/scripts/snap/Readme.txt @@ -1,7 +1,9 @@ -The purposes of these scripts is to merge some subfolder to jb-main branch from other branch (usually it is "integration" or "integration-release/something"). +The purposes of these scripts is to merge some subfolder (aka "snap") to jb-main branch from "integration" and "integration-release/*" branches. -The HEAD should be on the commit which you want to merge. +1. Checkout to the commit you want to snap + +2. Call ./snapCompose.sh (use another script for another folder) It creates 2 branches: -- integration-snap/$hash/to-jb-main - should be merged to jb-main. It is created from the merging currentCommit to merge-base(currentCommit, jb-main) -- integration-snap/$hash/to-integration - should be merged to integration, to avoid conflicts in future merges of jb-main. It is createad as "empty" merge of "to-jb-main" to merge-base(currentCommit, integration) +- integration-snap/$hash/to-jb-main - should be merged to "jb-main". It is created from the merging currentCommit to merge-base(currentCommit, jb-main) +- integration-snap/$hash/to-integration - should be merged to "integration", to avoid conflicts in future merges of jb-main. It is created as "empty" merge of "to-jb-main" to merge-base(currentCommit, integration) diff --git a/scripts/snap/impl/snapToJbMain.sh b/scripts/snap/impl/snapToJbMain.sh index 3d499c32df80e..18ab9e7671b05 100755 --- a/scripts/snap/impl/snapToJbMain.sh +++ b/scripts/snap/impl/snapToJbMain.sh @@ -1,9 +1,11 @@ #!/bin/bash +## See ../Readme.md for the purpose of this script + set -e if [ -z "$1" ]; then -echo "Specify the snapping subfolder. For example: ./snapToJbMain.sh androidx/compose-ui/1.6.0-alpha02 compose ':(exclude)compose/material3'" +echo "Specify folders to snap to jb-main. For example: ./snapToJbMain.sh compose ':(exclude)compose/material3'" exit 1 fi @@ -14,12 +16,12 @@ BRANCH_TO_RESTORE_IN_THE_END=$(git branch --show-current) TO_JB_MAIN_BRANCH=integration-snap/$CURRENT_COMMIT/to-jb-main -git checkout --quiet $(git merge-base $CURRENT_COMMIT origin/jb-main) -B $TO_JB_MAIN_BRANCH +git checkout --quiet $(git merge-base $CURRENT_COMMIT jb-main) -B $TO_JB_MAIN_BRANCH $DIR/snapSubfolder.sh $CURRENT_COMMIT $ALL_FOLDERS echo "Created $TO_JB_MAIN_BRANCH" TO_INTEGRATION_BRANCH=integration-snap/$CURRENT_COMMIT/to-integration -git checkout --quiet $(git merge-base $CURRENT_COMMIT origin/integration) -B $TO_INTEGRATION_BRANCH +git checkout --quiet $(git merge-base $CURRENT_COMMIT integration) -B $TO_INTEGRATION_BRANCH $DIR/mergeEmpty.sh $TO_JB_MAIN_BRANCH echo "Created $TO_INTEGRATION_BRANCH" From 8d3ef1b91f0e9bac0cfd84ff72d2f49184a2c363 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Thu, 18 Jul 2024 21:45:43 +0200 Subject: [PATCH 10/18] Discussions --- scripts/snap/impl/snapToJbMain.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/snap/impl/snapToJbMain.sh b/scripts/snap/impl/snapToJbMain.sh index 18ab9e7671b05..849b906b25f32 100755 --- a/scripts/snap/impl/snapToJbMain.sh +++ b/scripts/snap/impl/snapToJbMain.sh @@ -1,6 +1,7 @@ #!/bin/bash -## See ../Readme.md for the purpose of this script +# This script is rarely needed to be used explicitly. +# Use parent scripts and see the parent Readme.md set -e From 19a2adddd7a09eb89720c6e21fad98dabf42c355 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Thu, 18 Jul 2024 21:50:58 +0200 Subject: [PATCH 11/18] Discussions --- scripts/snap/Readme.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/snap/Readme.txt b/scripts/snap/Readme.txt index 827b1d3c551c6..18a5b3cd3f730 100644 --- a/scripts/snap/Readme.txt +++ b/scripts/snap/Readme.txt @@ -1,8 +1,10 @@ -The purposes of these scripts is to merge some subfolder (aka "snap") to jb-main branch from "integration" and "integration-release/*" branches. +The purposes of these scripts is to merge some subfolder (aka "snap") to jb-main branch from "integration" or "integration-release/*". -1. Checkout to the commit you want to snap +1. Checkout the commit you want to snap -2. Call ./snapCompose.sh (use another script for another folder) +2. [for integration branch] Merge jb-main to integration (not required, but useful to reduce conflicts) + +3. Call ./snapCompose.sh (use another script for another folder) It creates 2 branches: - integration-snap/$hash/to-jb-main - should be merged to "jb-main". It is created from the merging currentCommit to merge-base(currentCommit, jb-main) From f1256889b68abcced4116599aad2177457a9034f Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Thu, 18 Jul 2024 22:13:16 +0200 Subject: [PATCH 12/18] Discussions --- scripts/snap/impl/snapToJbMain.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/snap/impl/snapToJbMain.sh b/scripts/snap/impl/snapToJbMain.sh index 849b906b25f32..8cda0e071f473 100755 --- a/scripts/snap/impl/snapToJbMain.sh +++ b/scripts/snap/impl/snapToJbMain.sh @@ -15,14 +15,16 @@ ALL_FOLDERS=${@:1} CURRENT_COMMIT=$(git rev-parse --short @) BRANCH_TO_RESTORE_IN_THE_END=$(git branch --show-current) +JB_MAIN_BRANCH=$(git config branch.jb-main.remote)/jb-main +INTEGRATION_BRANCH=$(git config branch.integration.remote)/integration TO_JB_MAIN_BRANCH=integration-snap/$CURRENT_COMMIT/to-jb-main -git checkout --quiet $(git merge-base $CURRENT_COMMIT jb-main) -B $TO_JB_MAIN_BRANCH +git checkout --quiet $(git merge-base $CURRENT_COMMIT $JB_MAIN_BRANCH) -B $TO_JB_MAIN_BRANCH $DIR/snapSubfolder.sh $CURRENT_COMMIT $ALL_FOLDERS echo "Created $TO_JB_MAIN_BRANCH" TO_INTEGRATION_BRANCH=integration-snap/$CURRENT_COMMIT/to-integration -git checkout --quiet $(git merge-base $CURRENT_COMMIT integration) -B $TO_INTEGRATION_BRANCH +git checkout --quiet $(git merge-base $CURRENT_COMMIT $INTEGRATION_BRANCH) -B $TO_INTEGRATION_BRANCH $DIR/mergeEmpty.sh $TO_JB_MAIN_BRANCH echo "Created $TO_INTEGRATION_BRANCH" From c448c2a38fa93e1eb4715a929fdfcaf90a2b451b Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Thu, 18 Jul 2024 22:30:51 +0200 Subject: [PATCH 13/18] Refactoring --- scripts/snap/impl/snapToJbMain.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/snap/impl/snapToJbMain.sh b/scripts/snap/impl/snapToJbMain.sh index 8cda0e071f473..319380b2f0fb8 100755 --- a/scripts/snap/impl/snapToJbMain.sh +++ b/scripts/snap/impl/snapToJbMain.sh @@ -16,13 +16,12 @@ CURRENT_COMMIT=$(git rev-parse --short @) BRANCH_TO_RESTORE_IN_THE_END=$(git branch --show-current) JB_MAIN_BRANCH=$(git config branch.jb-main.remote)/jb-main -INTEGRATION_BRANCH=$(git config branch.integration.remote)/integration - TO_JB_MAIN_BRANCH=integration-snap/$CURRENT_COMMIT/to-jb-main git checkout --quiet $(git merge-base $CURRENT_COMMIT $JB_MAIN_BRANCH) -B $TO_JB_MAIN_BRANCH $DIR/snapSubfolder.sh $CURRENT_COMMIT $ALL_FOLDERS echo "Created $TO_JB_MAIN_BRANCH" +INTEGRATION_BRANCH=$(git config branch.integration.remote)/integration TO_INTEGRATION_BRANCH=integration-snap/$CURRENT_COMMIT/to-integration git checkout --quiet $(git merge-base $CURRENT_COMMIT $INTEGRATION_BRANCH) -B $TO_INTEGRATION_BRANCH $DIR/mergeEmpty.sh $TO_JB_MAIN_BRANCH From 8b5cd036c53c809341f74a89f21334bf9684d086 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Thu, 18 Jul 2024 22:31:10 +0200 Subject: [PATCH 14/18] Refactoring --- scripts/snap/impl/snapToJbMain.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/snap/impl/snapToJbMain.sh b/scripts/snap/impl/snapToJbMain.sh index 319380b2f0fb8..b973ff5fa832e 100755 --- a/scripts/snap/impl/snapToJbMain.sh +++ b/scripts/snap/impl/snapToJbMain.sh @@ -15,6 +15,7 @@ ALL_FOLDERS=${@:1} CURRENT_COMMIT=$(git rev-parse --short @) BRANCH_TO_RESTORE_IN_THE_END=$(git branch --show-current) + JB_MAIN_BRANCH=$(git config branch.jb-main.remote)/jb-main TO_JB_MAIN_BRANCH=integration-snap/$CURRENT_COMMIT/to-jb-main git checkout --quiet $(git merge-base $CURRENT_COMMIT $JB_MAIN_BRANCH) -B $TO_JB_MAIN_BRANCH From b765c7a9e30b802d0321410e744e153a8e946582 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Fri, 19 Jul 2024 21:49:13 +0200 Subject: [PATCH 15/18] Rename branch --- scripts/snap/impl/snapToJbMain.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/snap/impl/snapToJbMain.sh b/scripts/snap/impl/snapToJbMain.sh index b973ff5fa832e..8125e68bd6d69 100755 --- a/scripts/snap/impl/snapToJbMain.sh +++ b/scripts/snap/impl/snapToJbMain.sh @@ -12,18 +12,19 @@ fi DIR=$(dirname "$0") ALL_FOLDERS=${@:1} +FIRST_FOLDER=$1 +FIRST_FOLDER=${FIRST_FOLDER////-} # replace / by - CURRENT_COMMIT=$(git rev-parse --short @) BRANCH_TO_RESTORE_IN_THE_END=$(git branch --show-current) - JB_MAIN_BRANCH=$(git config branch.jb-main.remote)/jb-main -TO_JB_MAIN_BRANCH=integration-snap/$CURRENT_COMMIT/to-jb-main +TO_JB_MAIN_BRANCH=integration-snap/$FIRST_FOLDER/$CURRENT_COMMIT/to-jb-main git checkout --quiet $(git merge-base $CURRENT_COMMIT $JB_MAIN_BRANCH) -B $TO_JB_MAIN_BRANCH $DIR/snapSubfolder.sh $CURRENT_COMMIT $ALL_FOLDERS echo "Created $TO_JB_MAIN_BRANCH" INTEGRATION_BRANCH=$(git config branch.integration.remote)/integration -TO_INTEGRATION_BRANCH=integration-snap/$CURRENT_COMMIT/to-integration +TO_INTEGRATION_BRANCH=integration-snap/$FIRST_FOLDER/$CURRENT_COMMIT/to-integration git checkout --quiet $(git merge-base $CURRENT_COMMIT $INTEGRATION_BRANCH) -B $TO_INTEGRATION_BRANCH $DIR/mergeEmpty.sh $TO_JB_MAIN_BRANCH echo "Created $TO_INTEGRATION_BRANCH" From 4608f744f61d763ca9c806ecb96ce3623b011103 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Fri, 19 Jul 2024 21:49:26 +0200 Subject: [PATCH 16/18] Change readme --- scripts/snap/Readme.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/snap/Readme.txt b/scripts/snap/Readme.txt index 18a5b3cd3f730..3577211e37758 100644 --- a/scripts/snap/Readme.txt +++ b/scripts/snap/Readme.txt @@ -1,8 +1,8 @@ The purposes of these scripts is to merge some subfolder (aka "snap") to jb-main branch from "integration" or "integration-release/*". -1. Checkout the commit you want to snap +1. Checkout the commit you want to snap ("integration" or "integration-release/*") -2. [for integration branch] Merge jb-main to integration (not required, but useful to reduce conflicts) +2. Merge jb-main to integration, pick "jb-main" state in a case of conflicts in other folders 3. Call ./snapCompose.sh (use another script for another folder) From 16b584f8107403efda6a1e90b2ec339d4a55a07c Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Fri, 30 Aug 2024 14:39:17 +0200 Subject: [PATCH 17/18] Replace snap by copy --- scripts/copy/Readme.txt | 11 +++++++ scripts/copy/copyAnnotation.sh | 1 + scripts/copy/copyCollection.sh | 1 + scripts/copy/copyCompose.sh | 1 + scripts/copy/copyComposeMaterial3.sh | 1 + scripts/copy/copyComposeMaterial3Adaptive.sh | 1 + scripts/copy/copyLifecycle.sh | 1 + scripts/copy/copyMaterial3.sh | 1 + scripts/copy/copyNavigation.sh | 1 + scripts/copy/copySavedstate.sh | 1 + scripts/copy/copyWindow.sh | 1 + .../impl/copyToJbMain.sh} | 14 ++++++--- scripts/{snap => copy}/impl/mergeEmpty.sh | 0 scripts/snap/Readme.txt | 11 ------- scripts/snap/impl/snapSubfolder.sh | 31 ------------------- scripts/snap/snapAnnotation.sh | 1 - scripts/snap/snapCollection.sh | 1 - scripts/snap/snapCompose.sh | 1 - scripts/snap/snapComposeMaterial3.sh | 1 - scripts/snap/snapLifecycle.sh | 1 - scripts/snap/snapMaterial3.sh | 1 - scripts/snap/snapNavigation.sh | 1 - scripts/snap/snapSavedstate.sh | 1 - 23 files changed, 31 insertions(+), 54 deletions(-) create mode 100644 scripts/copy/Readme.txt create mode 100644 scripts/copy/copyAnnotation.sh create mode 100644 scripts/copy/copyCollection.sh create mode 100644 scripts/copy/copyCompose.sh create mode 100644 scripts/copy/copyComposeMaterial3.sh create mode 100644 scripts/copy/copyComposeMaterial3Adaptive.sh create mode 100644 scripts/copy/copyLifecycle.sh create mode 100644 scripts/copy/copyMaterial3.sh create mode 100644 scripts/copy/copyNavigation.sh create mode 100644 scripts/copy/copySavedstate.sh create mode 100644 scripts/copy/copyWindow.sh rename scripts/{snap/impl/snapToJbMain.sh => copy/impl/copyToJbMain.sh} (70%) mode change 100755 => 100644 rename scripts/{snap => copy}/impl/mergeEmpty.sh (100%) mode change 100755 => 100644 delete mode 100644 scripts/snap/Readme.txt delete mode 100755 scripts/snap/impl/snapSubfolder.sh delete mode 100755 scripts/snap/snapAnnotation.sh delete mode 100755 scripts/snap/snapCollection.sh delete mode 100755 scripts/snap/snapCompose.sh delete mode 100755 scripts/snap/snapComposeMaterial3.sh delete mode 100755 scripts/snap/snapLifecycle.sh delete mode 100755 scripts/snap/snapMaterial3.sh delete mode 100755 scripts/snap/snapNavigation.sh delete mode 100755 scripts/snap/snapSavedstate.sh diff --git a/scripts/copy/Readme.txt b/scripts/copy/Readme.txt new file mode 100644 index 0000000000000..16f9fae7c9c41 --- /dev/null +++ b/scripts/copy/Readme.txt @@ -0,0 +1,11 @@ +The purposes of these scripts is to copy some subfolder to jb-main branch from "integration" or "integration-release/*". + +1. Checkout the commit you want to copy ("integration" or "integration-release/*") + +2. Merge jb-main to integration, pick "jb-main" state in a case of conflicts in other folders + +3. Call ./copyCompose.sh (use another script for another folder) + +It creates 2 branches: +- integration-copy/$hash/to-jb-main - should be merged to "jb-main". It is based on merge-base(currentCommit, jb-main) and has the copy of the subfolder from currentCommit +- integration-copy/$hash/to-integration - should be merged to "integration", to avoid conflicts in future merges of jb-main. It is created as "empty" merge of "to-jb-main" to merge-base(currentCommit, integration) diff --git a/scripts/copy/copyAnnotation.sh b/scripts/copy/copyAnnotation.sh new file mode 100644 index 0000000000000..a89f11a2b44be --- /dev/null +++ b/scripts/copy/copyAnnotation.sh @@ -0,0 +1 @@ +$(dirname "$0")/impl/copyToJbMain.sh 'annotation' \ No newline at end of file diff --git a/scripts/copy/copyCollection.sh b/scripts/copy/copyCollection.sh new file mode 100644 index 0000000000000..252ede36d79a1 --- /dev/null +++ b/scripts/copy/copyCollection.sh @@ -0,0 +1 @@ +$(dirname "$0")/impl/copyToJbMain.sh 'collection' \ No newline at end of file diff --git a/scripts/copy/copyCompose.sh b/scripts/copy/copyCompose.sh new file mode 100644 index 0000000000000..5761333aaaffd --- /dev/null +++ b/scripts/copy/copyCompose.sh @@ -0,0 +1 @@ +$(dirname "$0")/impl/copyToJbMain.sh 'compose' ':(exclude)compose/material3' ':(exclude)compose/compiler' \ No newline at end of file diff --git a/scripts/copy/copyComposeMaterial3.sh b/scripts/copy/copyComposeMaterial3.sh new file mode 100644 index 0000000000000..ab40d90c582c8 --- /dev/null +++ b/scripts/copy/copyComposeMaterial3.sh @@ -0,0 +1 @@ +$(dirname "$0")/impl/copyToJbMain.sh 'compose/material3' ':(exclude)compose/material3/adaptive' \ No newline at end of file diff --git a/scripts/copy/copyComposeMaterial3Adaptive.sh b/scripts/copy/copyComposeMaterial3Adaptive.sh new file mode 100644 index 0000000000000..baec25b547c8b --- /dev/null +++ b/scripts/copy/copyComposeMaterial3Adaptive.sh @@ -0,0 +1 @@ +$(dirname "$0")/impl/copyToJbMain.sh 'compose/material3/adaptive' \ No newline at end of file diff --git a/scripts/copy/copyLifecycle.sh b/scripts/copy/copyLifecycle.sh new file mode 100644 index 0000000000000..153a64dd88e7d --- /dev/null +++ b/scripts/copy/copyLifecycle.sh @@ -0,0 +1 @@ +$(dirname "$0")/impl/copyToJbMain.sh 'lifecycle' \ No newline at end of file diff --git a/scripts/copy/copyMaterial3.sh b/scripts/copy/copyMaterial3.sh new file mode 100644 index 0000000000000..d51e47288ce03 --- /dev/null +++ b/scripts/copy/copyMaterial3.sh @@ -0,0 +1 @@ +$(dirname "$0")/impl/copyToJbMain.sh 'compose/material3' \ No newline at end of file diff --git a/scripts/copy/copyNavigation.sh b/scripts/copy/copyNavigation.sh new file mode 100644 index 0000000000000..289a56071d719 --- /dev/null +++ b/scripts/copy/copyNavigation.sh @@ -0,0 +1 @@ +$(dirname "$0")/impl/copyToJbMain.sh 'navigation' \ No newline at end of file diff --git a/scripts/copy/copySavedstate.sh b/scripts/copy/copySavedstate.sh new file mode 100644 index 0000000000000..35401b88dbb95 --- /dev/null +++ b/scripts/copy/copySavedstate.sh @@ -0,0 +1 @@ +$(dirname "$0")/impl/copyToJbMain.sh 'savedstate' \ No newline at end of file diff --git a/scripts/copy/copyWindow.sh b/scripts/copy/copyWindow.sh new file mode 100644 index 0000000000000..251108287a13d --- /dev/null +++ b/scripts/copy/copyWindow.sh @@ -0,0 +1 @@ +$(dirname "$0")/impl/copyToJbMain.sh 'window' \ No newline at end of file diff --git a/scripts/snap/impl/snapToJbMain.sh b/scripts/copy/impl/copyToJbMain.sh old mode 100755 new mode 100644 similarity index 70% rename from scripts/snap/impl/snapToJbMain.sh rename to scripts/copy/impl/copyToJbMain.sh index 8125e68bd6d69..eae6a1174ffa6 --- a/scripts/snap/impl/snapToJbMain.sh +++ b/scripts/copy/impl/copyToJbMain.sh @@ -6,25 +6,31 @@ set -e if [ -z "$1" ]; then -echo "Specify folders to snap to jb-main. For example: ./snapToJbMain.sh compose ':(exclude)compose/material3'" +echo "Specify folders to copy to jb-main. For example: ./copyToJbMain.sh compose ':(exclude)compose/material3'" exit 1 fi DIR=$(dirname "$0") +ROOT_DIR="$(dirname "$0")/../../.." ALL_FOLDERS=${@:1} FIRST_FOLDER=$1 FIRST_FOLDER=${FIRST_FOLDER////-} # replace / by - CURRENT_COMMIT=$(git rev-parse --short @) BRANCH_TO_RESTORE_IN_THE_END=$(git branch --show-current) + JB_MAIN_BRANCH=$(git config branch.jb-main.remote)/jb-main -TO_JB_MAIN_BRANCH=integration-snap/$FIRST_FOLDER/$CURRENT_COMMIT/to-jb-main +TO_JB_MAIN_BRANCH=integration-copy/$FIRST_FOLDER/$CURRENT_COMMIT/to-jb-main git checkout --quiet $(git merge-base $CURRENT_COMMIT $JB_MAIN_BRANCH) -B $TO_JB_MAIN_BRANCH -$DIR/snapSubfolder.sh $CURRENT_COMMIT $ALL_FOLDERS +( + cd $ROOT_DIR; + git checkout --quiet --no-overlay $CURRENT_COMMIT -- $ALL_FOLDERS; + git commit --quiet -m "Copy $FIRST_FOLDER from $CURRENT_COMMIT" +) echo "Created $TO_JB_MAIN_BRANCH" INTEGRATION_BRANCH=$(git config branch.integration.remote)/integration -TO_INTEGRATION_BRANCH=integration-snap/$FIRST_FOLDER/$CURRENT_COMMIT/to-integration +TO_INTEGRATION_BRANCH=integration-copy/$FIRST_FOLDER/$CURRENT_COMMIT/to-integration git checkout --quiet $(git merge-base $CURRENT_COMMIT $INTEGRATION_BRANCH) -B $TO_INTEGRATION_BRANCH $DIR/mergeEmpty.sh $TO_JB_MAIN_BRANCH echo "Created $TO_INTEGRATION_BRANCH" diff --git a/scripts/snap/impl/mergeEmpty.sh b/scripts/copy/impl/mergeEmpty.sh old mode 100755 new mode 100644 similarity index 100% rename from scripts/snap/impl/mergeEmpty.sh rename to scripts/copy/impl/mergeEmpty.sh diff --git a/scripts/snap/Readme.txt b/scripts/snap/Readme.txt deleted file mode 100644 index 3577211e37758..0000000000000 --- a/scripts/snap/Readme.txt +++ /dev/null @@ -1,11 +0,0 @@ -The purposes of these scripts is to merge some subfolder (aka "snap") to jb-main branch from "integration" or "integration-release/*". - -1. Checkout the commit you want to snap ("integration" or "integration-release/*") - -2. Merge jb-main to integration, pick "jb-main" state in a case of conflicts in other folders - -3. Call ./snapCompose.sh (use another script for another folder) - -It creates 2 branches: -- integration-snap/$hash/to-jb-main - should be merged to "jb-main". It is created from the merging currentCommit to merge-base(currentCommit, jb-main) -- integration-snap/$hash/to-integration - should be merged to "integration", to avoid conflicts in future merges of jb-main. It is created as "empty" merge of "to-jb-main" to merge-base(currentCommit, integration) diff --git a/scripts/snap/impl/snapSubfolder.sh b/scripts/snap/impl/snapSubfolder.sh deleted file mode 100755 index 3f75418a3dad9..0000000000000 --- a/scripts/snap/impl/snapSubfolder.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -## !!! Be careful using this script separately from the main scripts in the parent folder -## -## This script set the state of a subfolder to the state in some commit, creating a merge commit. -## Warning!!! Snapping subfolders breaks the base commit and future merges of the destination branch. To fix it, merge the destination branch back to the source branch, discarding all changes. - -set -e - -if [ -z "$1" ]; then -echo "Specify the snapping commit and the subfolders. For example: ./snapSubfolder.sh androidx/compose-ui/1.6.0-alpha02 compose ':(exclude)compose/material3'" -exit 1 -fi - -if [ -z "$2" ]; then -echo "Specify the snapping commit and the subfolders. For example: ./snapSubfolder.sh androidx/compose-ui/1.6.0-alpha02 compose ':(exclude)compose/material3'" -exit 1 -fi - -COMMIT=$1 -FIRST_FOLDER=$2 -ALL_FOLDERS=${@:2} - -ROOT_DIR="$(dirname "$0")/../../.." - -( - cd $ROOT_DIR; - git checkout --no-overlay $COMMIT -- $ALL_FOLDERS; - NEW_COMMIT=$(git commit-tree -p HEAD -p $COMMIT -m"Snap $COMMIT, subfolder $FIRST_FOLDER" $(git write-tree)); - git reset --hard $NEW_COMMIT; -) diff --git a/scripts/snap/snapAnnotation.sh b/scripts/snap/snapAnnotation.sh deleted file mode 100755 index af386b2a141ee..0000000000000 --- a/scripts/snap/snapAnnotation.sh +++ /dev/null @@ -1 +0,0 @@ -$(dirname "$0")/impl/snapToJbMain.sh 'annotation' \ No newline at end of file diff --git a/scripts/snap/snapCollection.sh b/scripts/snap/snapCollection.sh deleted file mode 100755 index b2f3c8edbe4e0..0000000000000 --- a/scripts/snap/snapCollection.sh +++ /dev/null @@ -1 +0,0 @@ -$(dirname "$0")/impl/snapToJbMain.sh 'collection' \ No newline at end of file diff --git a/scripts/snap/snapCompose.sh b/scripts/snap/snapCompose.sh deleted file mode 100755 index 2248fe68b1d90..0000000000000 --- a/scripts/snap/snapCompose.sh +++ /dev/null @@ -1 +0,0 @@ -$(dirname "$0")/impl/snapToJbMain.sh 'compose' ':(exclude)compose/material3' \ No newline at end of file diff --git a/scripts/snap/snapComposeMaterial3.sh b/scripts/snap/snapComposeMaterial3.sh deleted file mode 100755 index 036a000c0007f..0000000000000 --- a/scripts/snap/snapComposeMaterial3.sh +++ /dev/null @@ -1 +0,0 @@ -$(dirname "$0")/impl/snapToJbMain.sh 'compose/material3' \ No newline at end of file diff --git a/scripts/snap/snapLifecycle.sh b/scripts/snap/snapLifecycle.sh deleted file mode 100755 index aaa7605432ef7..0000000000000 --- a/scripts/snap/snapLifecycle.sh +++ /dev/null @@ -1 +0,0 @@ -$(dirname "$0")/impl/snapToJbMain.sh 'lifecycle' \ No newline at end of file diff --git a/scripts/snap/snapMaterial3.sh b/scripts/snap/snapMaterial3.sh deleted file mode 100755 index 036a000c0007f..0000000000000 --- a/scripts/snap/snapMaterial3.sh +++ /dev/null @@ -1 +0,0 @@ -$(dirname "$0")/impl/snapToJbMain.sh 'compose/material3' \ No newline at end of file diff --git a/scripts/snap/snapNavigation.sh b/scripts/snap/snapNavigation.sh deleted file mode 100755 index 561efbda3eb7a..0000000000000 --- a/scripts/snap/snapNavigation.sh +++ /dev/null @@ -1 +0,0 @@ -$(dirname "$0")/impl/snapToJbMain.sh 'navigation' \ No newline at end of file diff --git a/scripts/snap/snapSavedstate.sh b/scripts/snap/snapSavedstate.sh deleted file mode 100755 index 0a623942be4c0..0000000000000 --- a/scripts/snap/snapSavedstate.sh +++ /dev/null @@ -1 +0,0 @@ -$(dirname "$0")/impl/snapToJbMain.sh 'savedstate' \ No newline at end of file From 78674a04e76a897c187b388150a732e524cfbfc9 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Wed, 2 Oct 2024 14:41:50 +0200 Subject: [PATCH 18/18] Update scripts/copy/Readme.txt Co-authored-by: Ivan Matkov --- scripts/copy/Readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/copy/Readme.txt b/scripts/copy/Readme.txt index 16f9fae7c9c41..38609e09ba9e1 100644 --- a/scripts/copy/Readme.txt +++ b/scripts/copy/Readme.txt @@ -4,7 +4,7 @@ The purposes of these scripts is to copy some subfolder to jb-main branch from " 2. Merge jb-main to integration, pick "jb-main" state in a case of conflicts in other folders -3. Call ./copyCompose.sh (use another script for another folder) +3. Call `./copyCompose.sh` (use another script for another folder) It creates 2 branches: - integration-copy/$hash/to-jb-main - should be merged to "jb-main". It is based on merge-base(currentCommit, jb-main) and has the copy of the subfolder from currentCommit