Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 1487:2bc6cd62a29c
fix handling of files of unsupported type in the walk code
if a file was of unsupported type, it was considered as 'seen' while
walking. this way it was possible to have file in the dirstate not
yielded by the walk function.
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 02 Nov 2005 15:46:31 -0800 |
parents | 0902ffece4b4 |
children | c71420b186b0 |
line wrap: on
line source
#!/bin/sh hg init echo "nothing" > a hg add a hg commit -m ancestor -d "0 0" echo "something" > a hg commit -m branch1 -d "0 0" hg co 0 echo "something else" > a hg commit -m branch2 -d "0 0" HGMERGE=merge; export HGMERGE hg up -m 1 hg id grep -Ev ">>>|<<<" a hg status