Mercurial > hg
changeset 6255:ae83d927c629
add a test for a375ffc2aa1b
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Fri, 14 Mar 2008 09:56:58 -0300 |
| parents | 3667b6e4bbd0 |
| children | 69c75d063c7a |
| files | tests/test-merge-force tests/test-merge-force.out |
| diffstat | 2 files changed, 35 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-merge-force Fri Mar 14 09:56:58 2008 -0300 @@ -0,0 +1,26 @@ +#!/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 -v merge +echo % should show a as removed +hg st + +hg ci -m merge +echo % manifest. should not have a: +hg manifest
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-merge-force.out Fri Mar 14 09:56:58 2008 -0300 @@ -0,0 +1,9 @@ +% local deleted a file, remote removed +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