view tests/test-unrelated-pull.out @ 3733:9e67fecbfd16

merge: handle directory renames

commit: handle new copy dirstate case correctly
findcopies:
 keep a map of all copies found for directory logic
 add dirs filter
 check for merge:followdirs config option
 generate a directory move map
 find files that match directory move map
manifestmerge:
 add directory rename cases
applyupdates:
 skip actions with None file
 add "d" action
recordupdates:
 add "d" action
add simple directory rename test

pulling from ../a
searching for changes
abort: repository is unrelated
pulling from ../a
searching for changes
warning: repository is unrelated
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
changeset:   1:bdcee5d51fa6
tag:         tip
parent:      -1:000000000000
user:        a
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     a

changeset:   0:f155ba1aa5ba
user:        b
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     b