Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-symlinks.out @ 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 | 9d1c3529ebbc |
children | d7b9ec589546 |
line wrap: on
line source
adding foo adding bomb adding a.c adding dir/a.o adding dir/b.o ! a.c ! dir/a.o ! dir/b.o ? .hgignore a.c: unsupported file type (type is fifo) ! a.c # test absolute path through symlink outside repo A f # try symlink outside repo to file inside abort: ../z not under root