Mercurial > hg
view tests/test-merge-force.t @ 21736:07eb76186b41
run-tests: produce '!' mark after running a failing test
This patch fixes a regression recently introduced by a refactoring (see
92a6b16c9186 and about 200 previous changesets from Gregory Szorc). '!' mark
denotes that the test gets failed while testing.
author | anuraggoel <anurag.dsps@gmail.com> |
---|---|
date | Thu, 12 Jun 2014 01:28:22 +0530 |
parents | 94c394653b2a |
children | eeecf29cc397 |
line wrap: on
line source
$ hg init $ echo a > a $ hg ci -qAm 'add a' $ echo b > b $ hg ci -qAm 'add b' $ hg up -qC 0 $ hg rm a $ hg ci -m 'rm a' created new head $ hg up -qC 1 $ rm a Local deleted a file, remote removed Should fail, since there are deleted files: $ hg merge abort: uncommitted changes (use 'hg status' to list changes) [255] Should succeed with --force: $ hg -v merge --force resolving manifests removing a 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (branch merge, don't forget to commit) Should show 'a' as removed: $ hg status R a $ hg ci -m merge Should not show 'a': $ hg manifest b