view tests/test-rename-merge1 @ 10545:b9e4a67329cd stable

Updated contrib/vim/patchreview.* to version 0.2.1
1) adds a :DiffReview command to review code changes
   in the current workspace.

2) removes the need to have patchutils (specifically filterdiff)
   installed on the system by implementing patch extraction in
   pure vim script.

#!/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"
hg mv a b
hg mv a2 b2
hg ci -m "rename"
echo "checkout"
hg co 0
echo blahblah > a
echo blahblah > a2
hg mv a2 c2
hg ci -m "modify"
echo "merge"
hg merge -y --debug
hg status -AC
cat b
hg ci -m "merge"
hg debugindex .hg/store/data/b.i
hg debugrename b