Mercurial > evolve
changeset 4820:d842a4c6fc4a
tests: separate rewinding of merge commits, temporarily drop an error case
The error case will come back in the following commit, because it organically
fits there without the need of a separate working clone.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 23 Jul 2019 18:05:40 +0800 |
| parents | 316d910df72c |
| children | d8e36e60aea0 |
| files | tests/test-rewind.t |
| diffstat | 1 files changed, 8 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-rewind.t Wed Aug 07 15:22:16 2019 +0200 +++ b/tests/test-rewind.t Tue Jul 23 18:05:40 2019 +0800 @@ -924,25 +924,11 @@ $ cd .. -Check error cases -================= - - $ hg clone rewind-testing-base rewind-testing-error - updating to branch default - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ cd rewind-testing-error +Merge commits +============= -Uncommited changes ------------------- - - $ echo C > C - $ hg add C - $ hg rewind - abort: uncommitted changes - [255] - -Merge commits -------------- + $ hg clone -q rewind-testing-base rewind-merge + $ cd rewind-merge $ hg up --clean .^ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -965,7 +951,7 @@ $ hg rewind --from . rewinded to 1 changesets (1 changesets obsoleted) - working directory is now at 006fd8c2fed9 + working directory is now at 9d325190bd87 $ hg st --change . A B @@ -976,9 +962,11 @@ | |/ +---x 4: merge () | |/ - | o 3: foo (C foo) + | o 3: foo (foo) | | | ~ o 2: c_B0 (B) | ~ + + $ cd ..