Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-bad-pull.out @ 862:d70c1c31fd45
Fix 3-way-merge of original parent, workdir and new parent.
The dirstate has to match what is in the repository (what would be
checked out with 'hg update -C'), because the resulting file may be
identical to the new parent, or it may be completely different.
Previously the dirstate wasn't updated, so if you changed the file to
look like the original parent, it might be considered unmodified
relative to the new parent.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 10 Aug 2005 06:47:46 +0100 |
parents | 0902ffece4b4 |
children | 5a034646e472 |
line wrap: on
line source
+ hg clone http://localhost:20059/ copy requesting all changes abort: error: Connection refused 255 ls: copy: No such file or directory + hg clone http://localhost:20059/foo copy2 requesting all changes abort: HTTP Error 404: File not found 255