merge: fix small bug with a failed merge across a rename
If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy
f to fd, and util.set_exec wouldn't find the file.
#!/bin/sh
echo "[extensions]" >> $HGRCPATH
echo "mq=" >> $HGRCPATH
hg init a
cd a
echo 'base' > base
hg ci -Ambase -d '1 0'
hg qnew -mmqbase mqbase
hg qrename mqbase renamed
mkdir .hg/patches/foo
hg qrename renamed foo
hg qseries
ls .hg/patches/foo
mkdir .hg/patches/bar
hg qrename foo/renamed bar
hg qseries
ls .hg/patches/bar
hg qrename bar/renamed baz
hg qseries
ls .hg/patches/baz