tests/test-rename-merge1
author Mathieu Clabaut <mathieu.clabaut@gmail.com>
Thu, 24 May 2007 16:32:38 +0200
changeset 4489 afa1f57ae484
parent 3853 c0b449154a90
permissions -rwxr-xr-x
Add sending date to notify message. When using SMTP, no date field was set into the message, which causes it to be displayed as being send on 1st january 1970 on most MUA.

#!/bin/sh

mkdir t
cd t
hg init
echo "[merge]" >> .hg/hgrc
echo "followcopies = 1" >> .hg/hgrc
echo foo > a
echo foo > a2
hg add a a2
hg ci -m "start" -d "0 0"
hg mv a b
hg mv a2 b2
hg ci -m "rename" -d "0 0"
echo "checkout"
hg co 0
echo blahblah > a
echo blahblah > a2
hg mv a2 c2
hg ci -m "modify" -d "0 0"
echo "merge"
hg merge -y --debug
hg status -AC
cat b
hg ci -m "merge" -d "0 0"
hg debugindex .hg/store/data/b.i
hg debugrename b