1 #!/bin/sh

     2 # b51a8138292a introduced a regression where we would mention in the

     3 # changelog executable files added by the second parent of a merge.

     4 # Test that that doesn't happen anymore

     5 

     6 "$TESTDIR/hghave" execbit || exit 80

     7 

     8 hg init repo

     9 cd repo

    10 echo foo > foo

    11 hg ci -qAm 'add foo' -d '0 0'

    12 

    13 echo bar > bar

    14 chmod +x bar

    15 hg ci -qAm 'add bar' -d '0 0'

    16 echo '% manifest of p2:'

    17 hg manifest

    18 echo

    19 

    20 hg up -qC 0

    21 echo >> foo

    22 hg ci -m 'change foo' -d '0 0'

    23 echo '% manifest of p1:'

    24 hg manifest

    25 

    26 hg merge

    27 hg ci -m 'merge' -d '0 0'

    28 

    29 echo '% this should not mention bar:'

    30 hg tip -v

    31 

    32 hg debugindex .hg/store/data/bar.i