merge: fix adding untracked files on directory rename (issue612)
Fix from Brendan
Added test case
#!/bin/shhg init aecho a > a/ahg --cwd a ci -A -m ahg clone a becho b > b/bhg --cwd b ci -A -m bchmod 100 a/.hg/storehg --cwd b push ../achmod 700 a/.hg/store