Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-clone-failure @ 2548:0229ff95faec
Clarified message when nothing to merge is seen.
Sometimes there's a non-tip head waiting to be merged, especially after
pulling in remote changes while there were local modifications in the working
directory which had to be committed before 'hg merge' can work.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 03 Jul 2006 19:14:29 +0200 |
parents | 9c918287d10b |
children | 9dcf9d45cab8 |
line wrap: on
line source
#!/bin/sh # No local source hg clone a b echo $? # No remote source hg clone http://127.0.0.1:3121/a b echo $? rm -rf b # work around bug with http clone # Inaccessible source mkdir a chmod 000 a hg clone a b echo $? # Inaccessible destination mkdir b cd b hg init hg clone . ../a echo $? cd .. chmod 700 a rm -rf a b # Source of wrong type mkfifo a hg clone a b echo $? rm a # Default destination, same directory mkdir q cd q hg init cd .. hg clone q true