debian/compat
author Laurent Charignon <lcharignon@fb.com>
Wed, 24 Jun 2015 16:54:23 -0700
branchstable
changeset 1467 5c385b812500
parent 531 b18b00036355
child 4912 43e9bb4de6b5
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.

8