view tests/test-conflict @ 2395:8ed45fb1053a

remove appendfile for the manifest when adding a changegroup

Since the changelog is using appendfile, the manifest entries cannot
be referenced, so we don't need to use append file for the manifest.

#!/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