evolve: protect call to rebase within a wlock (#42, #35, #16) Without a wlock, repo.commit would blow away the dirstate's parents on OSes that have no 'os.symlink' support in python, leading evolve to produce a merge instead of a rebase. If a user ran the rebase command instead of evolve, then things would work because rebase is wrapped in a giant wlock. Unfortunately, we can't use the same idea of wrapping the evolve command in one giant wlock because that's too early in the process. If the lock did wrap the entire evolve command, then the working directory would save its current parents which, since rebase hasn't been called yet, would be just p1. Therefore, we need to obtain the lock *after* the dirstate's parents are changed but *before* the call to rebase. This way ensures that when a conflict happens the working directory correctly shows both parent changeset.

     1

This software was downloaded from

     2

https://bitbucket.org/marmoute/mutable-history

     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