Mercurial > hg
view tests/test-merge5.t @ 52006:989967d2f994
tests: stabilize `test-http-bad-server.t` on macOS
I'm not sure what's going on here, because I got one test run where this worked,
but two where it gave this error instead. It's connection related as the
comment says it should be, so good enough.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Wed, 09 Oct 2024 20:09:33 -0400 |
parents | 55c6ebd11cb9 |
children |
line wrap: on
line source
$ hg init repo $ cd repo $ echo This is file a1 > a $ echo This is file b1 > b $ hg add a b $ hg commit -m "commit #0" $ echo This is file b22 > b $ hg commit -m "comment #1" $ hg update 0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ rm b $ hg commit -A -m "comment #2" removing b created new head $ hg update 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ rm b $ hg update -c 2 abort: uncommitted changes [20] $ hg revert b $ hg update -c 2 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mv a c Should abort: $ hg update 1 abort: uncommitted changes (commit or update --clean to discard changes) [255] $ mv c a Should succeed: $ hg update 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved