Mercurial > hg
view tests/test-dirstate-backup.t @ 52136:e68fe567a780 stable
evolution: stop wrongly flagging unrelated part of a split as divergent
Before this change, divergence introduced by successors of a split would "spill"
to other unrelated successors of the split that were not ambiguous.
This small changes fixes it.
Thanks goes to Manuel Jacobs for the discussion leading to this realization that
a new simple and correct definition could be found.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 25 Oct 2024 17:33:47 +0200 |
parents | ffd19d73518d |
children |
line wrap: on
line source
Set up $ hg init repo $ cd repo $ echo a > a $ hg add a $ hg commit -m a Try to import an empty patch $ hg import --no-commit - <<EOF > EOF applying patch from stdin abort: stdin: no diffs found [10] No dirstate backups are left behind $ ls .hg/dirstate* | sort .hg/dirstate