Mercurial > hg
annotate tests/test-inotify-lookup.t @ 12765:5eed9ceebd64
merge: when --tool is specified, disable HGMERGE by setting to empty string
HGMERGE has different semantics than ui.merge. HGMERGE should hold the name
on an executable in your path, or an absolute tool path. As such, it's not
safe to simply copy the user's specified --tool value into HGMERGE. Instead,
we disable HGMERGE by setting it to an empty string.
author | Steve Borho <steve@borho.org> |
---|---|
date | Mon, 18 Oct 2010 23:20:14 -0500 |
parents | 5ae8711ea324 |
children | a9e830ecd9fb |
rev | line source |
---|---|
7084
f5c18a581b8b
inotify: add a test for lookup bug
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
1 |
12457
5ae8711ea324
tests: unify test-inotify-lookup
Matt Mackall <mpm@selenic.com>
parents:
7084
diff
changeset
|
2 $ "$TESTDIR/hghave" inotify || exit 80 |
5ae8711ea324
tests: unify test-inotify-lookup
Matt Mackall <mpm@selenic.com>
parents:
7084
diff
changeset
|
3 $ hg init |
5ae8711ea324
tests: unify test-inotify-lookup
Matt Mackall <mpm@selenic.com>
parents:
7084
diff
changeset
|
4 $ echo "[extensions]" > .hg/hgrc |
5ae8711ea324
tests: unify test-inotify-lookup
Matt Mackall <mpm@selenic.com>
parents:
7084
diff
changeset
|
5 $ echo "inotify=" >> .hg/hgrc |
5ae8711ea324
tests: unify test-inotify-lookup
Matt Mackall <mpm@selenic.com>
parents:
7084
diff
changeset
|
6 $ hg inserve -d --pid-file .hg/inotify.pid |
5ae8711ea324
tests: unify test-inotify-lookup
Matt Mackall <mpm@selenic.com>
parents:
7084
diff
changeset
|
7 $ echo a > a |
5ae8711ea324
tests: unify test-inotify-lookup
Matt Mackall <mpm@selenic.com>
parents:
7084
diff
changeset
|
8 $ hg ci -Aqm0 |
5ae8711ea324
tests: unify test-inotify-lookup
Matt Mackall <mpm@selenic.com>
parents:
7084
diff
changeset
|
9 $ hg co -q null |
5ae8711ea324
tests: unify test-inotify-lookup
Matt Mackall <mpm@selenic.com>
parents:
7084
diff
changeset
|
10 $ hg co -q |
5ae8711ea324
tests: unify test-inotify-lookup
Matt Mackall <mpm@selenic.com>
parents:
7084
diff
changeset
|
11 $ hg st |
5ae8711ea324
tests: unify test-inotify-lookup
Matt Mackall <mpm@selenic.com>
parents:
7084
diff
changeset
|
12 $ cat a |
5ae8711ea324
tests: unify test-inotify-lookup
Matt Mackall <mpm@selenic.com>
parents:
7084
diff
changeset
|
13 a |
5ae8711ea324
tests: unify test-inotify-lookup
Matt Mackall <mpm@selenic.com>
parents:
7084
diff
changeset
|
14 $ kill `cat .hg/inotify.pid` |