| changeset 6256 | 69c75d063c7a |
| parent 6255 | ae83d927c629 |
| 6255:ae83d927c629 | 6256:69c75d063c7a |
|---|---|
15 |
15 |
16 hg up -qC 1 |
16 hg up -qC 1 |
17 rm a |
17 rm a |
18 |
18 |
19 echo '% local deleted a file, remote removed' |
19 echo '% local deleted a file, remote removed' |
20 hg -v merge |
20 hg merge # should fail, since there are deleted files |
21 hg -v merge --force |
|
21 echo % should show a as removed |
22 echo % should show a as removed |
22 hg st |
23 hg st |
23 |
24 |
24 hg ci -m merge |
25 hg ci -m merge |
25 echo % manifest. should not have a: |
26 echo % manifest. should not have a: |