Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-diff-subdir @ 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 | 096f1c73cdc3 |
children |
line wrap: on
line source
#!/bin/sh hg init mkdir alpha touch alpha/one mkdir beta touch beta/two hg add alpha/one beta/two hg ci -m "start" -d "1000000 0" echo 1 > alpha/one echo 2 > beta/two echo EVERYTHING hg diff --nodates echo BETA ONLY hg diff --nodates beta echo INSIDE BETA cd beta hg diff --nodates .