annotate tests/test-inotify-issue1371.t @ 14732:e9ed3506f066 stable

backout of d04ba50e104d: allow to qpop/push with a dirty working copy The new behavior was breaking existing tools that relied on a sequence such as this: 1) start with a dirty working copy 2) qimport some patch 3) try to qpush it 4) old behavior would fail at this point due to outstanding changes. (new behavior would only fail if the outstanding changes and the patches changes intersect) 5) innocent user qrefreshes, gets his local changes in the imported patch It's worth considering if we can move this behavior to -f in the future.
author Idan Kamara <idankk86@gmail.com>
date Fri, 24 Jun 2011 23:25:42 +0300
parents 9965b90c7ed7
children 4f8054d3171b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7302
972737252d05 inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff changeset
1
12454
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
2 $ "$TESTDIR/hghave" inotify || exit 80
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
3 $ hg init
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
4 $ touch a b c d e f
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
5 $ echo "[extensions]" >> $HGRCPATH
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
6 $ echo "inotify=" >> $HGRCPATH
7302
972737252d05 inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff changeset
7
12454
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
8 inserve
7302
972737252d05 inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff changeset
9
12454
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
10 $ hg inserve -d --pid-file=hg.pid 2>&1
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
11 $ cat hg.pid >> "$DAEMON_PIDS"
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
12 $ hg ci -Am m
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
13 adding a
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
14 adding b
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
15 adding c
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
16 adding d
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
17 adding e
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
18 adding f
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
19 adding hg.pid
7302
972737252d05 inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff changeset
20
12454
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
21 let the daemon finish its stuff
7302
972737252d05 inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff changeset
22
12454
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
23 $ sleep 1
7302
972737252d05 inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff changeset
24
12454
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
25 eed to test all file opperations
7302
972737252d05 inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff changeset
26
12454
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
27 $ hg rm a
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
28 $ rm b
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
29 $ echo c >> c
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
30 $ touch g
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
31 $ hg add g
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
32 $ hg mv e h
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
33 $ hg status
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
34 M c
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
35 A g
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
36 A h
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
37 R a
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
38 R e
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
39 ! b
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
40 $ sleep 1
7302
972737252d05 inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff changeset
41
12454
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
42 Are we able to kill the service? if not, the service died on some error
7302
972737252d05 inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff changeset
43
12454
9965b90c7ed7 tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents: 7351
diff changeset
44 $ kill `cat hg.pid`