mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
33 lines
571 B
Bash
Executable File
33 lines
571 B
Bash
Executable File
#!/bin/sh
|
|
# b51a8138292a introduced a regression where we would mention in the
|
|
# changelog executable files added by the second parent of a merge.
|
|
# Test that that doesn't happen anymore
|
|
|
|
"$TESTDIR/hghave" execbit || exit 80
|
|
|
|
hg init repo
|
|
cd repo
|
|
echo foo > foo
|
|
hg ci -qAm 'add foo'
|
|
|
|
echo bar > bar
|
|
chmod +x bar
|
|
hg ci -qAm 'add bar'
|
|
echo '% manifest of p2:'
|
|
hg manifest
|
|
echo
|
|
|
|
hg up -qC 0
|
|
echo >> foo
|
|
hg ci -m 'change foo'
|
|
echo '% manifest of p1:'
|
|
hg manifest
|
|
|
|
hg merge
|
|
hg ci -m 'merge'
|
|
|
|
echo '% this should not mention bar:'
|
|
hg tip -v
|
|
|
|
hg debugindex .hg/store/data/bar.i
|