tests/test-conflict
author Josef "Jeff" Sipek <jeffpc@josefsipek.net>
Sun, 03 Sep 2006 16:25:41 -0400
changeset 3046 461573aa02ef
parent 2283 e506c14382fd
child 4361 46280c004f22
permissions -rwxr-xr-x
[churn] Ignore merge csets Merge changesets attributed a large number of lines to people that didn't actually develop it, but simply merged the code. By ignoring merges, we get a more accurate picture of how much code everyone changed.

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
HGMERGE=merge; export HGMERGE
hg merge 1
hg id
egrep -v ">>>|<<<" a
hg status