view tests/test-simple-update @ 5227:466323968b23

Avoid adding to the changelog executable files added by the second parent.

This was a regression introduced by b51a8138292a.

#!/bin/sh

set -e

mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit -m "1"
hg verify

hg clone . ../branch
cd ../branch
hg co
echo bar>>foo
hg commit -m "2"

cd ../test
hg pull ../branch
hg verify
hg co
cat foo
hg manifest --debug