Mercurial > hg
view tests/test-merge5.t @ 45992:9dd5b129ff28
tests: set old git default branch name for compatibility
Git's default branch name has changed on my machine (from "master" to
"main"). Let's set the old name in our tests so we're compatible with
both defaults (and maybe still compatible with Git versions that don't
know about the config option).
Differential Revision: https://phab.mercurial-scm.org/D9470
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 30 Nov 2020 09:47:46 -0800 |
parents | 527ce85c2e60 |
children | 55c6ebd11cb9 |
line wrap: on
line source
$ hg init $ 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