Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-bad-pull.out @ 768:20e95c245bc3
Fix local file changes being ignored after non-branch merge
Bug introduced in eea96285cbf9
Spotted by TAH
author | mpm@selenic.com |
---|---|
date | Sat, 23 Jul 2005 10:00:56 -0500 |
parents | 574869103985 |
children | 122449dd89db 445970ccf57a |
line wrap: on
line source
+ hg clone http://localhost:20059/ copy requesting all changes abort: error 111: Connection refused + echo 255 255 + ls copy ls: copy: No such file or directory + cat + set +x + hg clone http://localhost:20059/foo copy2 requesting all changes abort: HTTP Error 404: File not found + echo 255 255 + set +x