Mercurial > evolve
view docs/commands.rst @ 5788:961a940aef57
divergence-resolution: [patch 3] fix a messed up test case
Because of logic change in divergence resolution which causes the order change
in picking the resolution parent this test case was messed up.
It was supposed to test that it hits merge conflict while merging the
two divergent csets but because of some change in previous patches, we hit
conflict early during relocation of one of the cset.
This patch, by resolving the conflict for relocation make sure that we test
the conflict while merging the two divergent csets.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sun, 24 Jan 2021 20:09:28 +0530 |
| parents | 3f466d348047 |
| children |
line wrap: on
line source
------------------------- Evolve Commands Reference ------------------------- .. highlight:: none amend ----- .. hghelp:: amend evolve ------ .. hghelp:: evolve fold ---- .. hghelp:: fold metaedit -------- .. hghelp:: metaedit next ---- .. hghelp:: next obslog ------ .. hghelp:: obslog pdiff ----- .. hghelp:: pdiff previous -------- .. hghelp:: previous prune ----- .. hghelp:: prune pstatus ------- .. hghelp:: pstatus split ----- .. hghelp:: split touch ----- .. hghelp:: touch uncommit -------- .. hghelp:: uncommit