Added latest data

benedikt-schesch · Sep 17, 2024 · 9105f33 · 9105f33
1 parent d122be9
commit 9105f33
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/src/python/repo.py b/src/python/repo.py
@@ -120,12 +120,9 @@ def clone_repo(repo_slug: str, repo_dir: Path) -> None:
         "git_hires_merge",
         "spork",
         "intellimerge",
-        # The below is mostly "X + plume-lib-merging-fixups",
-        # except that these are not:
-        #  * "adjacent"
-        #  * "imports"
-        #  * "version_numbers"
-        # TODO: move those above this comment, then adjust the comment.
+        "adjacent",
+        "imports",
+        "version_numbers",
         "plumelib_git_hires_merge",
         "plumelib_intellimerge",
         "plumelib_recursive_histogram",
@@ -137,9 +134,6 @@ def clone_repo(repo_slug: str, repo_dir: Path) -> None:
         "plumelib_spork",
         "plumelib_ort",
         "plumelib_ort_ignorespace",
-        "adjacent",
-        "imports",
-        "version_numbers",
     ],
 )
 MERGE_STATE = Enum(

diff --git a/src/scripts/merge_tools/plumelib_adjacent.sh b/src/scripts/merge_tools/plumelib_adjacent.sh
@@ -7,7 +7,5 @@ clone_dir=$1
 branch1=$2
 branch2=$3
 git_strategy="-s ort"
-# Uses both --adjacent and all of plume-lib merging's default behaviors.
-# Thus, this implements "adjacent + plume-lib-merging-fixups".
 plumelib_strategy="--adjacent"
 "$MERGE_SCRIPTS_DIR"/merge_git_then_plumelib.sh "$clone_dir" "$branch1" "$branch2" "$git_strategy" "$plumelib_strategy"