Mercurial > hg > mercurial-crew-with-dirclash
annotate 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 |
rev | line source |
---|---|
503
c6a2e41c8c60
Fix troubles with clone and exception handling
mpm@selenic.com
parents:
395
diff
changeset
|
1 + hg clone http://localhost:20059/ copy |
395 | 2 requesting all changes |
775 | 3 abort: error: Connection refused |
503
c6a2e41c8c60
Fix troubles with clone and exception handling
mpm@selenic.com
parents:
395
diff
changeset
|
4 255 |
545
721bfca3a9dc
Work-around failing tests/test-bad-pull with slow bg process.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
524
diff
changeset
|
5 ls: copy: No such file or directory |
503
c6a2e41c8c60
Fix troubles with clone and exception handling
mpm@selenic.com
parents:
395
diff
changeset
|
6 + hg clone http://localhost:20059/foo copy2 |
395 | 7 requesting all changes |
8 abort: HTTP Error 404: File not found | |
503
c6a2e41c8c60
Fix troubles with clone and exception handling
mpm@selenic.com
parents:
395
diff
changeset
|
9 255 |