On Tue, 03 Jul 2018 12:32:23 +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld <boris.f...@octobus.net> > # Date 1530195073 -7200 > # Thu Jun 28 16:11:13 2018 +0200 > # Node ID 2885f27ab442bf42ad8c21c47f4304132a62f59a > # Parent 9d94a3118a9c253a09bdf48258548dca92e35018 > # EXP-Topic diff-cleanup > # Available At https://bitbucket.org/octobus/mercurial-devel/ > # hg pull https://bitbucket.org/octobus/mercurial-devel/ -r > 2885f27ab442 > diffutil: extract diff options code into a dedicated util-module
This can't be applied. Can you rebase? > copy from mercurial/patch.py > copy to mercurial/utils/diffutil.py > --- a/mercurial/patch.py > +++ b/mercurial/utils/diffutil.py My two cents. It's probably better to not put diffutil under the utils package because util* is a set of classes/functions not depending on ui, repo, etc. _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel