diff --git a/src/python/repo.py b/src/python/repo.py index c57ddd951a..681ccabbeb 100755 --- 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(