Mercurial > hg
view tests/test-issue612.t @ 46426:0da465780bba
rhg: Build in release mode on CI
This follows e73b40c790ec which made tests use the release executable.
With e73b40c790ec but not this, tests are skipped on CI
because the executable is missing.
Differential Revision: https://phab.mercurial-scm.org/D9907
author | Simon Sapin <simon.sapin@octobus.net> |
---|---|
date | Fri, 29 Jan 2021 13:46:19 +0100 |
parents | 4441705b7111 |
children | 55c6ebd11cb9 |
line wrap: on
line source
https://bz.mercurial-scm.org/612 $ hg init $ mkdir src $ echo a > src/a.c $ hg ci -Ama adding src/a.c $ hg mv src source moving src/a.c to source/a.c $ hg ci -Ammove $ hg co -C 0 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo new > src/a.c $ echo compiled > src/a.o $ hg ci -mupdate created new head $ hg status ? src/a.o $ hg merge merging src/a.c and source/a.c to source/a.c 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg status M source/a.c R src/a.c ? src/a.o