Mercurial > evolve
changeset 5964:7204178ac04a
tests: spell out hg resolve
See previous commits for the rationale.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 17 Jun 2021 11:18:30 +0300 |
| parents | c0b439f14260 |
| children | e1eefdd90846 |
| files | tests/test-evolve-content-divergent-interrupted.t tests/test-evolve-content-divergent-stack.t tests/test-evolve-public-content-divergent-corner-cases.t tests/test-evolve-public-content-divergent-discard.t tests/test-evolve-public-content-divergent-main.t |
| diffstat | 5 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-interrupted.t Thu Jun 17 11:16:53 2021 +0300 +++ b/tests/test-evolve-content-divergent-interrupted.t Thu Jun 17 11:18:30 2021 +0300 @@ -376,7 +376,7 @@ this test case is mainly to test that we hit merge conlict while merging the two divergent csets, so resolving this one which happened during relocation $ echo a > a - $ hg res -m + $ hg resolve -m (no more unresolved files) continue: hg evolve --continue
--- a/tests/test-evolve-content-divergent-stack.t Thu Jun 17 11:16:53 2021 +0300 +++ b/tests/test-evolve-content-divergent-stack.t Thu Jun 17 11:18:30 2021 +0300 @@ -274,7 +274,7 @@ (see 'hg help evolve.interrupted') [240] $ echo c > c - $ hg res -m + $ hg resolve -m (no more unresolved files) continue: hg evolve --continue @@ -303,7 +303,7 @@ +new_file $ echo c > c - $ hg res -m + $ hg resolve -m (no more unresolved files) continue: hg evolve --continue $ hg evolve -c @@ -545,7 +545,7 @@ [240] $ echo b > b - $ hg res -m + $ hg resolve -m (no more unresolved files) continue: hg evolve --continue $ hg evolve --continue @@ -558,7 +558,7 @@ [240] $ echo b > b - $ hg res -m + $ hg resolve -m (no more unresolved files) continue: hg evolve --continue $ hg evolve --continue @@ -867,7 +867,7 @@ [240] $ echo foo > b - $ hg res -m + $ hg resolve -m (no more unresolved files) continue: hg evolve --continue $ hg evolve --continue
--- a/tests/test-evolve-public-content-divergent-corner-cases.t Thu Jun 17 11:16:53 2021 +0300 +++ b/tests/test-evolve-public-content-divergent-corner-cases.t Thu Jun 17 11:18:30 2021 +0300 @@ -415,7 +415,7 @@ +e $ echo c > c - $ hg res -m + $ hg resolve -m (no more unresolved files) continue: hg evolve --continue
--- a/tests/test-evolve-public-content-divergent-discard.t Thu Jun 17 11:16:53 2021 +0300 +++ b/tests/test-evolve-public-content-divergent-discard.t Thu Jun 17 11:18:30 2021 +0300 @@ -287,7 +287,7 @@ +>>>>>>> other: 229da2719b19 - test: added ch $ echo ch > ch - $ hg res -m + $ hg resolve -m (no more unresolved files) continue: hg evolve --continue @@ -390,7 +390,7 @@ [240] $ echo c > c - $ hg res -m + $ hg resolve -m (no more unresolved files) continue: hg evolve --continue @@ -495,7 +495,7 @@ [240] $ echo dh > dh - $ hg res -m + $ hg resolve -m (no more unresolved files) continue: hg evolve --continue @@ -598,7 +598,7 @@ [240] $ echo c > c - $ hg res -m + $ hg resolve -m (no more unresolved files) continue: hg evolve --continue @@ -612,7 +612,7 @@ [240] $ echo dh > dh - $ hg res -m + $ hg resolve -m (no more unresolved files) continue: hg evolve --continue
--- a/tests/test-evolve-public-content-divergent-main.t Thu Jun 17 11:16:53 2021 +0300 +++ b/tests/test-evolve-public-content-divergent-main.t Thu Jun 17 11:18:30 2021 +0300 @@ -385,7 +385,7 @@ +e $ echo c > c - $ hg res -m + $ hg resolve -m (no more unresolved files) continue: hg evolve --continue @@ -495,7 +495,7 @@ [240] $ echo d > d - $ hg res -m + $ hg resolve -m (no more unresolved files) continue: hg evolve --continue @@ -608,7 +608,7 @@ +e $ echo cfoo > c - $ hg res -m + $ hg resolve -m (no more unresolved files) continue: hg evolve --continue @@ -622,7 +622,7 @@ [240] $ echo d > d - $ hg res -m + $ hg resolve -m (no more unresolved files) continue: hg evolve --continue