Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-issue612 @ 5043:8b1ee1f59b3c
dirstate: improve error message on file/directory clash
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 01 Aug 2007 12:03:10 -0700 |
parents | 9797124581c9 |
children |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init mkdir src echo a > src/a.c hg ci -Ama -d "10000000 0" hg mv src source hg ci -Ammove -d "1000000 0" hg co -C 0 echo new > src/a.c echo compiled > src/a.o hg ci -mupdate -d "1000000 0" hg st hg merge hg st