Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-empty-file @ 3506:9de0e64545a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test that we notice the empty files from the second parent during a merge This didn't work with 0.9.1, but was fixed by 05257fd28591.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Wed, 25 Oct 2006 02:51:27 -0300
parents
children ad3d5b4367cb
comparison
equal deleted inserted replaced
3505:0aef94f45ebf 3506:9de0e64545a3
1 #!/bin/sh
2
3 hg init a
4 cd a
5 touch empty1
6 hg add empty1
7 hg commit -m 'add empty1' -d '1000000 0'
8
9 touch empty2
10 hg add empty2
11 hg commit -m 'add empty2' -d '1000000 0'
12
13 hg up -C 0
14 touch empty3
15 hg add empty3
16 hg commit -m 'add empty3' -d '1000000 0'
17
18 hg heads
19
20 hg merge 1
21 # before changeset 05257fd28591, we didn't notice the
22 # empty file that came from rev 1.
23 hg status
24 hg commit -m merge -d '1000000 0'
25 hg manifest tip