Re: [PATCH v2] rebase: make sure merge state is cleaned up for no-op rebases

2017-05-17 Thread Augie Fackler
On Tue, May 16, 2017 at 12:20:07PM -0700, Jeremy Fitzhardinge wrote: > # HG changeset patch > # User Jeremy Fitzhardinge > # Date 1494962309 25200 > # Tue May 16 12:18:29 2017 -0700 > # Node ID 45e596670f05aba81f7caef7c778812028c7bc5a > # Parent cb26d4cdd0f71423edde7451daf49f6f30bb385b > reb

Re: [PATCH v2] rebase: make sure merge state is cleaned up for no-op rebases

2017-05-16 Thread Augie Fackler
On Tue, May 16, 2017 at 12:20:07PM -0700, Jeremy Fitzhardinge wrote: > # HG changeset patch > # User Jeremy Fitzhardinge > # Date 1494962309 25200 > # Tue May 16 12:18:29 2017 -0700 > # Node ID 45e596670f05aba81f7caef7c778812028c7bc5a > # Parent cb26d4cdd0f71423edde7451daf49f6f30bb385b > reb

[PATCH v2] rebase: make sure merge state is cleaned up for no-op rebases

2017-05-16 Thread Jeremy Fitzhardinge
# HG changeset patch # User Jeremy Fitzhardinge # Date 1494962309 25200 # Tue May 16 12:18:29 2017 -0700 # Node ID 45e596670f05aba81f7caef7c778812028c7bc5a # Parent cb26d4cdd0f71423edde7451daf49f6f30bb385b rebase: make sure merge state is cleaned up for no-op rebases If a rebase ends up doi