view tests/test-unrelated-pull.out @ 861:cbe5c4d016b7

dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Interface is not yet changed. Non-regular files are considered to be removed or deleted. Removed the unneeded match(fn) call for adding to the unknown list.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 09 Aug 2005 11:32:30 +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