Mercurial > hg
view tests/test-changelog-exec @ 12212:bb63f0532aa6 stable
i18n-pt_BR: synchronized with 31dde4c3bb83
author | Wagner Bruna <wbruna@softwareexpress.com.br> |
---|---|
date | Fri, 20 Aug 2010 21:22:57 -0300 |
parents | 6c82beaaa11a |
children |
line wrap: on
line source
#!/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