black and byteify-strings breaking your patches

Augie Fackler raf at durin42.com
Sun Oct 6 12:13:55 EDT 2019


Folks, we just landed my mass-reformatting patches that start unwinding the source mangler in mercurial/__init__.py. As a result, your patches are probably all unable to apply right now. To fix up your code, you'll probably want to do something like this:

1) rebase your changes to 9cc55b743713 (the last change before the formatting)
2) rebase again to 687b865b95ad (the second of the two changes that rewrote everything)
3) When you get merge conflicts in (2), resolve them all with your edits, and follow the instructions in 687b865b95ad's commit message on how the change was generated. Look before you leap on accepting edits to make sure things are reasonable.

Note that you need to have black from https://github.com/psf/black/pull/826 - you can install it from my fork (linked from the PR) until that PR lands. They had indicated to me that it'd be this week, but we're all at the sprint and decided to forge ahead instead of continuing to block our Python 3 progress on the PR landing.

Sorry for the mess!

Augie



More information about the Mercurial-devel mailing list