Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-empty @ 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 2b77ea66fe70
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1338
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
1 #!/bin/sh
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
2
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
3 hg init
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
4 hg log
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
5 hg grep wah
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
6 hg manifest
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
7 hg verify