Mercurial > hg
diff tests/test-update-branches.t @ 43938:489fdf27769c
status: make morestatus call out unresolved conflicts after update
Differential Revision: https://phab.mercurial-scm.org/D7704
author | Rodrigo Damazio Bovendorp <rdamazio@google.com> |
---|---|
date | Wed, 18 Dec 2019 23:43:21 -0800 |
parents | 5709a9992c2a |
children | 07ebb567e8bb |
line wrap: on
line diff
--- a/tests/test-update-branches.t Wed Dec 18 23:41:36 2019 -0800 +++ b/tests/test-update-branches.t Wed Dec 18 23:43:21 2019 -0800 @@ -252,6 +252,12 @@ $ hg st M a ? a.orig + # Unresolved merge conflicts: + # + # a + # + # To mark files as resolved: hg resolve --mark FILE + $ cat a <<<<<<< working copy: 6efa171f091b - test: 3 three @@ -315,6 +321,12 @@ $ rm a.orig $ hg status M a + # Unresolved merge conflicts: + # + # a + # + # To mark files as resolved: hg resolve --mark FILE + $ hg resolve -l U a @@ -553,6 +565,12 @@ $ hg status M a M foo + # Unresolved merge conflicts: + # + # a + # + # To mark files as resolved: hg resolve --mark FILE + $ hg revert -r . a @@ -561,6 +579,12 @@ U a $ hg status M foo + # Unresolved merge conflicts: + # + # a + # + # To mark files as resolved: hg resolve --mark FILE + $ hg status -Tjson [ { @@ -577,6 +601,8 @@ R a $ hg status M foo + # No unresolved merge conflicts. + $ hg status -Tjson [ { @@ -589,6 +615,8 @@ Test that 4 is detected as the no-argument destination from 3 and also moves the bookmark with it $ hg up --quiet 0 # we should be able to update to 3 directly + $ hg status + M foo $ hg up --quiet --hidden 3 # but not implemented yet. updated to hidden changeset 6efa171f091b (hidden revision '6efa171f091b' was rewritten as: d047485b3896)