hgext/__init__.py
author Laurent Charignon <lcharignon@fb.com>
Wed, 24 Jun 2015 16:54:23 -0700
branchstable
changeset 1467 5c385b812500
parent 519 9825c7da5b54
child 1619 5ef77a1d975c
permissions -rw-r--r--
evolve: dedupe divergents when running evolve --all --any or evolve --rev Before this patch, when running evolve --all --any or evolve --rev with the --divergent flag, we were selecting all of the divergents. After solving the first one, its counterparts would get pruned and potentially hidden which would crash when trying to resolve them. This patch introduces logic to dedupe the divergents to be resolved by keeping only one per group of divergent with the lower revision number.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
519
9825c7da5b54 ensure all file have a copyright notice
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 496
diff changeset
     1
# Copyright 2011 Logilab SA <contact@logilab.fr>