On Tue, 11 Aug 2015 14:58:45 +1200, Robert Collins
wrote:
> On 11 August 2015 at 10:38, Brett Cannon wrote:
> > We have all been there: you fix something in some maintenance branch, do
> > your `hg pull` into the default branch, and everything but Misc/NEWS merges
> > cleanly. You typically reve
On 11 August 2015 at 10:38, Brett Cannon wrote:
> We have all been there: you fix something in some maintenance branch, do
> your `hg pull` into the default branch, and everything but Misc/NEWS merges
> cleanly. You typically revert Misc/NEWS, commit your forward-ported change
> to default, and th
We have all been there: you fix something in some maintenance branch, do
your `hg pull` into the default branch, and everything *but* Misc/NEWS
merges cleanly. You typically revert Misc/NEWS, commit your forward-ported
change to default, and then move on with your life. It would be much easier
if M
