Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-mq-guards.out @ 3295:764688cf51e5
merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 08 Oct 2006 19:57:45 -0500 |
parents | 851b07ec450c |
children | 193e9c6d1a6d |
rev | line source |
---|---|
2815
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
1 adding x |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
2 Patch queue now empty |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
3 % should fail |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
4 abort: no patches applied |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
5 applying a.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
6 Now at: a.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
7 % should guard a.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
8 % should print +a |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
9 a.patch: +a |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
10 Patch queue now empty |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
11 a.patch: +a |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
12 % should push b.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
13 applying b.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
14 Now at: b.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
15 Patch queue now empty |
2832
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2818
diff
changeset
|
16 number of unguarded, unapplied patches has changed from 2 to 3 |
2815
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
17 % should push a.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
18 applying a.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
19 Now at: a.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
20 % should print -a |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
21 c.patch: -a |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
22 % should skip c.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
23 applying b.patch |
2818
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2815
diff
changeset
|
24 skipping c.patch - guarded by '- a' |
2815
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
25 Now at: b.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
26 % should push c.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
27 applying c.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
28 Now at: c.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
29 Patch queue now empty |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
30 guards deactivated |
2832
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2818
diff
changeset
|
31 number of unguarded, unapplied patches has changed from 3 to 2 |
2818
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2815
diff
changeset
|
32 % should push all |
2815
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
33 applying b.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
34 applying c.patch |
bce6918b0474
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
35 Now at: c.patch |
2818
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2815
diff
changeset
|
36 Patch queue now empty |
2838
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
37 number of unguarded, unapplied patches has changed from 1 to 2 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
38 % should push a.patch, not b.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
39 applying a.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
40 Now at: a.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
41 applying c.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
42 Now at: c.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
43 Patch queue now empty |
2818
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2815
diff
changeset
|
44 % should push b.patch |
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2815
diff
changeset
|
45 applying b.patch |
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2815
diff
changeset
|
46 Now at: b.patch |
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2815
diff
changeset
|
47 Patch queue now empty |
2838
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
48 number of unguarded, unapplied patches has changed from 2 to 3 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
49 % should push a.patch, b.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
50 applying a.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
51 Now at: a.patch |
2818
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2815
diff
changeset
|
52 applying b.patch |
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2815
diff
changeset
|
53 Now at: b.patch |
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2815
diff
changeset
|
54 Patch queue now empty |
2832
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2818
diff
changeset
|
55 number of unguarded, unapplied patches has changed from 3 to 2 |
2838
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
56 % list patches and guards |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
57 a.patch: +1 +2 -3 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
58 b.patch: +2 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
59 c.patch: unguarded |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
60 % list series |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
61 0 G a.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
62 1 U b.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
63 2 U c.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
64 % list guards |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
65 1 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
66 2 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
67 3 |
2818
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2815
diff
changeset
|
68 % should push b.patch |
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2815
diff
changeset
|
69 applying b.patch |
05316bb57d01
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2815
diff
changeset
|
70 Now at: b.patch |
2832
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2818
diff
changeset
|
71 applying c.patch |
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2818
diff
changeset
|
72 Now at: c.patch |
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2818
diff
changeset
|
73 guards deactivated |
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2818
diff
changeset
|
74 popping guarded patches |
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2818
diff
changeset
|
75 Patch queue now empty |
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2818
diff
changeset
|
76 reapplying unguarded patches |
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2818
diff
changeset
|
77 applying c.patch |
582cbc4392cb
qselect: add --pop, --reapply options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2818
diff
changeset
|
78 Now at: c.patch |
2838
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
79 % guards in series file: +1 +2 -3 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
80 +1 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
81 +2 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
82 -3 |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
83 % should show c.patch |
851b07ec450c
mq: apply patch is any posative guard matches
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2832
diff
changeset
|
84 c.patch |