Mercurial > hg

annotate tests/test-inotify-issue1542.t @ 14485:610873cf064a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make pull -u behave like pull && update Previously, pull would not update if new branch heads were received, whereas pull && update would move to the tipmost branch head. Also change the "crosses branches" abort in merge.update from "crosses branches (merge branches or use --check to force update)" to "crosses branches (merge branches or update --check to force update)" since it can no longer assume the user is running hg update.
author Brendan Cully <brendan@kublai.com>
date Tue, 31 May 2011 11:52:22 -0700
parents 92b2c876a79d
children f7c4eb60b0c3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7892
67e59a9886d5 Fixing issue1542, adding a relevant test
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
1
12455
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
2 $ "$TESTDIR/hghave" inotify || exit 80
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
3 $ hg init
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
4 $ touch a
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
5 $ mkdir dir
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
6 $ touch dir/b
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
7 $ touch dir/c
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
8 $ echo "[extensions]" >> $HGRCPATH
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
9 $ echo "inotify=" >> $HGRCPATH
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
10 $ hg add dir/c
7892
67e59a9886d5 Fixing issue1542, adding a relevant test
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
11
12455
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
12 inserve
7892
67e59a9886d5 Fixing issue1542, adding a relevant test
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
13
12455
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
14 $ hg inserve -d --pid-file=hg.pid 2>&1
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
15 $ cat hg.pid >> "$DAEMON_PIDS"
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
16 $ hg st
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
17 A dir/c
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
18 ? a
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
19 ? dir/b
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
20 ? hg.pid
7892
67e59a9886d5 Fixing issue1542, adding a relevant test
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
21
12455
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
22 moving dir out
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
23
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
24 $ mv dir ../tmp-test-inotify-issue1542
7892
67e59a9886d5 Fixing issue1542, adding a relevant test
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
25
12455
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
26 status
7892
67e59a9886d5 Fixing issue1542, adding a relevant test
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
27
12455
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
28 $ hg st
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
29 ! dir/c
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
30 ? a
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
31 ? hg.pid
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
32 $ sleep 1
7892
67e59a9886d5 Fixing issue1542, adding a relevant test
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
33
12455
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
34 Are we able to kill the service? if not, the service died on some error
7892
67e59a9886d5 Fixing issue1542, adding a relevant test
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
35
12455
92b2c876a79d tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com>
parents: 7892
diff changeset
36 $ kill `cat hg.pid`