Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove some of the comments #354

Merged
merged 2 commits into from
Sep 17, 2024
Merged

Remove some of the comments #354

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9105f33
Added latest data
benedikt-schesch Sep 17, 2024
f350c1c
reverted changes
benedikt-schesch Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions src/python/repo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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(
Expand Down
2 changes: 0 additions & 2 deletions src/scripts/merge_tools/plumelib_adjacent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you remove this comment?

# 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"