Mercurial > hg
view tests/test-changelog-exec.t @ 14762:6beb26747430 stable
tests: ignore inotify extension in test-duplicateoptions.py
The inotify extension is only available on linux and setup.py will not install
it on other platforms - but it will of course always be there in the source.
test-duplicateoptions.py tried to load most extensions (including inotify if
available). When the local uninstalled Mercurial was used it would thus always
load the inotify extension and cause a warning on unsupported platforms.
The inotify extension is not relevant for this test, so now we explicitly
ignore it.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Wed, 29 Jun 2011 00:19:27 +0200 |
parents | ec5886db9dc6 |
children | f2719b387380 |
line wrap: on
line source
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' manifest of p2: $ hg manifest bar foo $ hg up -qC 0 $ echo >> foo $ hg ci -m 'change foo' created new head manifest of p1: $ hg manifest foo $ hg merge 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg ci -m 'merge' this should not mention bar: $ hg tip -v changeset: 3:ef2fc9b4a51b tag: tip parent: 2:ed1b79f46b9a parent: 1:d394a8db219b user: test date: Thu Jan 01 00:00:00 1970 +0000 description: merge $ hg debugindex bar rev offset length base linkrev nodeid p1 p2 0 0 5 0 1 b004912a8510 000000000000 000000000000