evolve: use cmdrewrite.amend() instead of creating a new commit This patch backs out changeset 88601e1cd5d8. We replaced cmdrewrite.amend() with creating new commit because using amend(), a high level function was not good and creating a new commit gave us more control over things. **HOWEVER** to get more control, you need to get arrange all the pieces together perfectly. Creating a new commit, the existing logic has some bugs around dirstate handling, the `repo.dirstate.setparents()` call especially. Sometimes this fixes the dirstate correctly sometimes not. As Pierre-Yves David said, "Having a "clumsy" implementation with the right behavior is usually a good first step. So having an amend based implementation seems like a good first step.", let's take a step back and get back using amend so that we can have a correct basic implementation which is bug free.

     1

This software was downloaded from

     2

https://www.mercurial-scm.org/repo/evolve/

     3

     4

Copyright 2011 Peter Arrenbrecht <peter.arrenbrecht@gmail.com>

     5

               Logilab SA        <contact@logilab.fr>

     6

               Pierre-Yves David <pierre-yves.david@ens-lyon.org>

     7

	       Patrick Mezard <patrick@mezard.eu>

     8

     9

    10

This software may be used and distributed according to the terms of the GNU

    11

General Public License version 2 or any later version.

    12

    13

On Debian systems, the complete text of the GNU General Public License version

    14

2 can be found in `/usr/share/common-licenses/GPL-2'.

    15