Mercurial > hg
changeset 12256:2a06cb547be8
tests: unify test-merge-force
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Sat, 11 Sep 2010 17:58:37 +0200 |
| parents | 9b3c02c36d92 |
| children | 470e0b1ddc6e |
| files | tests/test-merge-force tests/test-merge-force.out tests/test-merge-force.t |
| diffstat | 3 files changed, 43 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-merge-force Sat Sep 11 11:44:53 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -#!/bin/sh - -hg init repo -cd repo - -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' - -hg up -qC 1 -rm a - -echo '% local deleted a file, remote removed' -hg merge # should fail, since there are deleted files -hg -v merge --force -echo % should show a as removed -hg st - -hg ci -m merge -echo % manifest. should not have a: -hg manifest
--- a/tests/test-merge-force.out Sat Sep 11 11:44:53 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -created new head -% local deleted a file, remote removed -abort: outstanding uncommitted changes (use 'hg status' to list changes) -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 -R a -% manifest. should not have a: -b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-merge-force.t Sat Sep 11 17:58:37 2010 +0200 @@ -0,0 +1,43 @@ + $ 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: outstanding uncommitted changes (use 'hg status' to list changes) + +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 +