Mercurial > hg
view tests/test-merge5.t @ 38734:25880ddf9a86
macosx: fixing macOS version generation after db9d1dd01bf0
With the Python3 change, the string is now something like
version = b'4.6.2+848-88be288e8ac1'
where it was previously just:
version = '4.6.2+848-88be288e8ac1'
Differential Revision: https://phab.mercurial-scm.org/D3964
author | Rodrigo Damazio <rdamazio@google.com> |
---|---|
date | Wed, 18 Jul 2018 18:36:39 -0700 |
parents | 6b1fc09c699a |
children | 527ce85c2e60 |
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 [255] $ 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