+robhogan, this is why the script didn't work for you today -- sorry for the trouble

> Destructively rebase to REBASE_COMMIT,
What is REBASE_COMMIT ?

> always picking our branch in case of conflicts. Not sure how to do this in git.
git rebase -s recursive -X theirs ?

Although I am not sure I understand the rationale of the full sequence (regardless on how to achieve it in git)


On an un unrelated not, isn't this problem the same of: if you develop new code after the mega refactor, keep in mind that now you should use the new coding style?

I meant RENAME_COMMIT, not REBASE_COMMIT.

The end state I want to end up in is a "rebased" commit where we overwrite all files that we saved state for with the recorded state.

And sure, new code should be written to the new coding style -- but this happens when rebasing across the rename commit, which I think people would reasonably expect to work.

OK I had a horrible idea. After resolving conflicts, we can check if there were any files that were added (and didn't conflict) and unconditionally overwrite them from the stashed changes. Then, we can amend the rename commit with the updated files and everyone will be happy! Maybe.

Since I don't really want to sync back 6 months in time, I'm planning to test that the updated strategy works using tkent's mv scripts.

Marking this as Tools component, but really it's just something that doesn't have a component. If the Tools team objects, we can mark it as Blink and add a note for Blink bug triage rotation to ignore the lack of specific component.

Looks like we could do without this.

...oh nvm, looks like you want this for the rename too.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/345fe03c2430e9d4b94810c15a469c3624ac186b

commit 345fe03c2430e9d4b94810c15a469c3624ac186b
Author: Daniel Cheng <dcheng@chromium.org>
Date: Fri Feb 23 22:36:52 2018

Remove Blink rename merge helper.

Bug:  676588 ,  711127 
Change-Id: I4ee8c447379f924c55410805ebc9fbc219fc7864
Reviewed-on: https://chromium-review.googlesource.com/924651
Reviewed-by: Kent Tamura <tkent@chromium.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#538929}
[delete] https://crrev.com/70af5e98e7dabca59b8e42cbc3d99e3fdf6d0117/tools/blink_rename_merge_helper/.gitignore
[delete] https://crrev.com/70af5e98e7dabca59b8e42cbc3d99e3fdf6d0117/tools/blink_rename_merge_helper/COMPONENTS
[delete] https://crrev.com/70af5e98e7dabca59b8e42cbc3d99e3fdf6d0117/tools/blink_rename_merge_helper/OWNERS
[delete] https://crrev.com/70af5e98e7dabca59b8e42cbc3d99e3fdf6d0117/tools/blink_rename_merge_helper/README.md
[delete] https://crrev.com/70af5e98e7dabca59b8e42cbc3d99e3fdf6d0117/tools/blink_rename_merge_helper/data/idl_blocklist.txt
[delete] https://crrev.com/70af5e98e7dabca59b8e42cbc3d99e3fdf6d0117/tools/blink_rename_merge_helper/data/manual.patch
[delete] https://crrev.com/70af5e98e7dabca59b8e42cbc3d99e3fdf6d0117/tools/blink_rename_merge_helper/pylib/__init__.py
[delete] https://crrev.com/70af5e98e7dabca59b8e42cbc3d99e3fdf6d0117/tools/blink_rename_merge_helper/pylib/blink_rename_merge_helper/__init__.py
[delete] https://crrev.com/70af5e98e7dabca59b8e42cbc3d99e3fdf6d0117/tools/blink_rename_merge_helper/pylib/blink_rename_merge_helper/auto_squasher.py
[delete] https://crrev.com/70af5e98e7dabca59b8e42cbc3d99e3fdf6d0117/tools/blink_rename_merge_helper/pylib/blink_rename_merge_helper/driver.py
[delete] https://crrev.com/70af5e98e7dabca59b8e42cbc3d99e3fdf6d0117/tools/blink_rename_merge_helper/pylib/blink_rename_merge_helper/merge.py
[delete] https://crrev.com/70af5e98e7dabca59b8e42cbc3d99e3fdf6d0117/tools/blink_rename_merge_helper/run.py