Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-unrelated-pull.out @ 862:d70c1c31fd45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 init
+ hg add a
+ hg commit -m a -u a -d 0 0
+ hg init
+ hg add b
+ hg commit -m b -u b -d 0 0
+ hg pull ../a
pulling from ../a
searching for changes
warning: pulling from an unrelated repository!
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 heads
changeset:   1:9a79c33a9db3
tag:         tip
user:        a
date:        Thu Jan  1 00:00:00 1970
summary:     a

changeset:   0:01f8062b2de5
user:        b
date:        Thu Jan  1 00:00:00 1970
summary:     b