Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-empty-file @ 3506:9de0e64545a3
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 |
line wrap: on
line diff
new file mode 100755 --- /dev/null +++ b/tests/test-empty-file @@ -0,0 +1,25 @@ +#!/bin/sh + +hg init a +cd a +touch empty1 +hg add empty1 +hg commit -m 'add empty1' -d '1000000 0' + +touch empty2 +hg add empty2 +hg commit -m 'add empty2' -d '1000000 0' + +hg up -C 0 +touch empty3 +hg add empty3 +hg commit -m 'add empty3' -d '1000000 0' + +hg heads + +hg merge 1 +# before changeset 05257fd28591, we didn't notice the +# empty file that came from rev 1. +hg status +hg commit -m merge -d '1000000 0' +hg manifest tip