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

#!/bin/sh

hg init a
echo a > a/a
hg --cwd a ci -Ama

hg clone a c

hg clone a b
echo b >> b/a
hg --cwd b ci -mb

echo % push should push to default when default-push not set
hg --cwd b push | sed 's/pushing to.*/pushing/'

echo % push should push to default-push when set
echo 'default-push = ../c' >> b/.hg/hgrc
hg --cwd b push | sed 's/pushing to.*/pushing/'