Mercurial > hg

comparison tests/test-merge-force @ 6255:ae83d927c629

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add a test for a375ffc2aa1b
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 14 Mar 2008 09:56:58 -0300
parents
children 69c75d063c7a
comparison
equal deleted inserted replaced
6254:3667b6e4bbd0 6255:ae83d927c629
1 #!/bin/sh
2
3 hg init repo
4 cd repo
5
6 echo a > a
7 hg ci -qAm 'add a'
8
9 echo b > b
10 hg ci -qAm 'add b'
11
12 hg up -qC 0
13 hg rm a
14 hg ci -m 'rm a'
15
16 hg up -qC 1
17 rm a
18
19 echo '% local deleted a file, remote removed'
20 hg -v merge
21 echo % should show a as removed
22 hg st
23
24 hg ci -m merge
25 echo % manifest. should not have a:
26 hg manifest