Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-push-warn.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 | 9c918287d10b |
| children | 5a034646e472 |
line wrap: on
line source
+ hg init + hg add t1 + hg commit -m 1 -d 0 0 + hg clone a b + hg add t2 + hg commit -m 2 -d 0 0 + hg add t3 + hg commit -m 3 -d 0 0 + hg push ../a pushing to ../a searching for changes abort: unsynced remote changes! (did you forget to sync? use push -f to force) + hg pull ../a pulling from ../a searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) + hg push ../a pushing to ../a searching for changes abort: push creates new remote branches! (did you forget to merge? use push -f to force) + hg up -m + hg commit -m 4 -d 0 0 + hg push ../a pushing to ../a searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files