diff contrib/merge-test-compat.sh @ 3901:f2b8429db565 stable

builddependencies: don't remove found deps when divergence found (issue5946) It seems obviously wrong to not keep any dependencies for a revision that we had already found (for p1) if we run into divergence (from p2). It also happens to fix issue5946 :)
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 25 Jul 2018 15:30:37 -0700
parents 13a4c35f7a0b
children 6db9e2350948
line wrap: on
line diff