comparison tests/test-push-checkheads-unpushed-D5.t @ 5786:c0122b98356c

divergence-resolution: [patch 1] 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 that it hits conflict while relocating the divergent cset but because of some change in previous patches, relocation went successful and it hits conflict while merging the two divergent csets. This patch, by making some changes in files content make sure that we get conflict during relocation.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 24 Jan 2021 19:47:17 +0530
parents f0d46ffbf1bb
children 73cb6cafc930 144d10e74757
comparison
equal deleted inserted replaced
5785:a9ad01ed1539 5786:c0122b98356c