Mercurial > hg-stable
changeset 45589:8c02c6262a5e
tests: add some more debugmergestate calls in `test-merge-criss-cross.t`
Differential Revision: https://phab.mercurial-scm.org/D9029
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Mon, 14 Sep 2020 15:08:15 +0530 |
| parents | 479cce8c9882 |
| children | 768412472663 |
| files | tests/test-merge-criss-cross.t |
| diffstat | 1 files changed, 53 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-merge-criss-cross.t Thu Sep 03 13:58:14 2020 +0530 +++ b/tests/test-merge-criss-cross.t Mon Sep 14 15:08:15 2020 +0530 @@ -659,6 +659,8 @@ (branch merge, don't forget to commit) $ ls -1 other-file + $ hg debugmergestate + no merge state found (merging a deletion with keeping → conflict) BROKEN: this should result in conflict @@ -673,6 +675,16 @@ other-file the-file (newfilenode !) +#if newfilenode + $ hg debugmergestate + local (working copy): adfd88e5d7d3d3e22bdd26512991ee64d59c1d8f + other (merge rev): 38a4c3e7cac8c294ecb0a7a85a05464e9836ca78 + extra: the-file (merge-removal-candidate = yes) +#else + $ hg debugmergestate + no merge state found +#endif + (merging a deletion with keeping → conflict) BROKEN: this should result in conflict @@ -684,6 +696,8 @@ (branch merge, don't forget to commit) $ ls -1 other-file + $ hg debugmergestate + no merge state found (merging two deletion together → no conflict) @@ -694,6 +708,8 @@ (branch merge, don't forget to commit) $ ls -1 other-file + $ hg debugmergestate + no merge state found (merging a deletion with keeping → conflict) BROKEN: this should result in conflict @@ -707,6 +723,15 @@ $ ls -1 other-file the-file (newfilenode !) +#if newfilenode + $ hg debugmergestate + local (working copy): a4e0e44229dc130be2915b92c957c093f8c7ee3e + other (merge rev): 38a4c3e7cac8c294ecb0a7a85a05464e9836ca78 + extra: the-file (merge-removal-candidate = yes) +#else + $ hg debugmergestate + no merge state found +#endif (merging a deletion with keeping → conflict) BROKEN: this should result in conflict @@ -719,6 +744,8 @@ (branch merge, don't forget to commit) $ ls -1 other-file + $ hg debugmergestate + no merge state found (merging two "keeping" together → no conflict) @@ -731,6 +758,15 @@ $ ls -1 other-file the-file +#if newfilenode + $ hg debugmergestate + local (working copy): 5e3eccec60d88f94a7ba57c351f32cb24c15fe0c + other (merge rev): 38a4c3e7cac8c294ecb0a7a85a05464e9836ca78 + extra: the-file (filenode-source = other) +#else + $ hg debugmergestate + no merge state found +#endif (merging a deletion with keeping → conflict) BROKEN: this should result in conflict @@ -744,6 +780,8 @@ $ ls -1 other-file the-file + $ hg debugmergestate + no merge state found (merging a deletion with keeping → conflict) BROKEN: this should result in conflict @@ -756,6 +794,8 @@ $ ls -1 other-file the-file + $ hg debugmergestate + no merge state found (merging two "keeping" together → no conflict) @@ -768,6 +808,8 @@ $ ls -1 other-file the-file + $ hg debugmergestate + no merge state found (merging a deletion with keeping → conflict) BROKEN: this should result in conflict @@ -780,6 +822,8 @@ $ ls -1 other-file the-file + $ hg debugmergestate + no merge state found (merging a deletion with keeping → conflict) BROKEN: this should result in conflict @@ -792,3 +836,12 @@ $ ls -1 other-file the-file +#if newfilenode + $ hg debugmergestate + local (working copy): 38a4c3e7cac8c294ecb0a7a85a05464e9836ca78 + other (merge rev): a4e0e44229dc130be2915b92c957c093f8c7ee3e + extra: the-file (merge-removal-candidate = yes) +#else + $ hg debugmergestate + no merge state found +#endif