annotate tests/test-bisect2.t @ 11860:56c7c3209e1a

tests: unify test-bisect2
author Martin Geisler <mg@lazybytes.net>
date Sat, 14 Aug 2010 02:55:54 +0200
parents tests/test-bisect2@9369095779a1
children 652f71b235bf
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11860
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
1 # The tests in test-bisect are done on a linear history. Here the
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
2 # following repository history is used for testing:
6859
9369095779a1 add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff changeset
3 #
11860
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
4 # 17
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
5 # |
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
6 # 18 16
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
7 # \ /
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
8 # 15
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
9 # / \
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
10 # / \
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
11 # 10 13
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
12 # / \ |
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
13 # / \ | 14
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
14 # 7 6 9 12 /
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
15 # \ / \ | |/
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
16 # 4 \ | 11
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
17 # \ \ | /
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
18 # 3 5 | /
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
19 # \ / |/
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
20 # 2 8
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
21 # \ /
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
22 # 1
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
23 # |
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
24 # 0
6859
9369095779a1 add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff changeset
25
9369095779a1 add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff changeset
26
11860
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
27 $ set -e
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
28
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
29 init
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
30
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
31 $ hg init
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
32
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
33 committing changes
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
34
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
35 $ echo > a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
36 $ echo '0' >> a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
37 $ hg add a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
38 $ hg ci -m "0" -d "0 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
39 $ echo '1' >> a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
40 $ hg ci -m "1" -d "1 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
41 $ echo '2' >> a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
42 $ hg ci -m "2" -d "2 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
43 $ echo '3' >> a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
44 $ hg ci -m "3" -d "3 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
45 $ echo '4' >> a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
46 $ hg ci -m "4" -d "4 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
47
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
48 create branch
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
49
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
50 $ hg up -r 2
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
51 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
52 $ echo '5' >> b
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
53 $ hg add b
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
54 $ hg ci -m "5" -d "5 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
55 created new head
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
56
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
57 merge
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
58
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
59 $ hg merge
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
60 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
61 (branch merge, don't forget to commit)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
62 $ hg ci -m "merge 4,5" -d "6 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
63
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
64 create branch
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
65
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
66 $ hg up -r 4
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
67 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
68 $ echo '7' > c
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
69 $ hg add c
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
70 $ hg ci -m "7" -d "7 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
71 created new head
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
72
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
73 create branch
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
74
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
75 $ hg up -r 1
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
76 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
77 $ echo '8' > d
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
78 $ hg add d
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
79 $ hg ci -m "8" -d "8 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
80 created new head
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
81 $ echo '9' >> d
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
82 $ hg ci -m "9" -d "9 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
83
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
84 merge
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
85
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
86 $ hg merge -r 6
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
87 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
88 (branch merge, don't forget to commit)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
89 $ hg ci -m "merge 6,9" -d "10 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
90
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
91 create branch
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
92
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
93 $ hg up -r 8
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
94 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
95 $ echo '11' > e
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
96 $ hg add e
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
97 $ hg ci -m "11" -d "11 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
98 created new head
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
99 $ echo '12' >> e
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
100 $ hg ci -m "12" -d "12 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
101 $ echo '13' >> e
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
102 $ hg ci -m "13" -d "13 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
103
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
104 create branch
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
105
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
106 $ hg up -r 11
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
107 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
108 $ echo '14' > f
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
109 $ hg add f
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
110 $ hg ci -m "14" -d "14 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
111 created new head
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
112
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
113 merge
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
114
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
115 $ hg up -r 13 -C
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
116 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
117 $ hg merge -r 10
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
118 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
119 (branch merge, don't forget to commit)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
120 $ hg ci -m "merge 10,13" -d "15 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
121 $ echo '16' >> e
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
122 $ hg ci -m "16" -d "16 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
123 $ echo '17' >> e
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
124 $ hg ci -m "17" -d "17 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
125
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
126 create branch
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
127
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
128 $ hg up -r 15
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
129 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
130 $ echo '18' >> e
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
131 $ hg ci -m "18" -d "18 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
132 created new head
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
133
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
134 log
6859
9369095779a1 add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff changeset
135
11860
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
136 $ hg log
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
137 changeset: 18:d42e18c7bc9b
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
138 tag: tip
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
139 parent: 15:857b178a7cf3
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
140 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
141 date: Thu Jan 01 00:00:18 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
142 summary: 18
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
143
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
144 changeset: 17:228c06deef46
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
145 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
146 date: Thu Jan 01 00:00:17 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
147 summary: 17
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
148
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
149 changeset: 16:609d82a7ebae
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
150 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
151 date: Thu Jan 01 00:00:16 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
152 summary: 16
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
153
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
154 changeset: 15:857b178a7cf3
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
155 parent: 13:b0a32c86eb31
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
156 parent: 10:429fcd26f52d
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
157 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
158 date: Thu Jan 01 00:00:15 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
159 summary: merge 10,13
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
160
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
161 changeset: 14:faa450606157
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
162 parent: 11:82ca6f06eccd
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
163 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
164 date: Thu Jan 01 00:00:14 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
165 summary: 14
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
166
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
167 changeset: 13:b0a32c86eb31
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
168 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
169 date: Thu Jan 01 00:00:13 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
170 summary: 13
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
171
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
172 changeset: 12:9f259202bbe7
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
173 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
174 date: Thu Jan 01 00:00:12 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
175 summary: 12
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
176
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
177 changeset: 11:82ca6f06eccd
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
178 parent: 8:dab8161ac8fc
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
179 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
180 date: Thu Jan 01 00:00:11 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
181 summary: 11
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
182
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
183 changeset: 10:429fcd26f52d
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
184 parent: 9:3c77083deb4a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
185 parent: 6:a214d5d3811a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
186 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
187 date: Thu Jan 01 00:00:10 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
188 summary: merge 6,9
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
189
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
190 changeset: 9:3c77083deb4a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
191 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
192 date: Thu Jan 01 00:00:09 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
193 summary: 9
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
194
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
195 changeset: 8:dab8161ac8fc
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
196 parent: 1:4ca5088da217
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
197 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
198 date: Thu Jan 01 00:00:08 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
199 summary: 8
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
200
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
201 changeset: 7:50c76098bbf2
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
202 parent: 4:5c668c22234f
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
203 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
204 date: Thu Jan 01 00:00:07 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
205 summary: 7
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
206
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
207 changeset: 6:a214d5d3811a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
208 parent: 5:385a529b6670
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
209 parent: 4:5c668c22234f
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
210 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
211 date: Thu Jan 01 00:00:06 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
212 summary: merge 4,5
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
213
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
214 changeset: 5:385a529b6670
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
215 parent: 2:051e12f87bf1
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
216 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
217 date: Thu Jan 01 00:00:05 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
218 summary: 5
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
219
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
220 changeset: 4:5c668c22234f
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
221 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
222 date: Thu Jan 01 00:00:04 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
223 summary: 4
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
224
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
225 changeset: 3:0950834f0a9c
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
226 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
227 date: Thu Jan 01 00:00:03 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
228 summary: 3
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
229
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
230 changeset: 2:051e12f87bf1
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
231 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
232 date: Thu Jan 01 00:00:02 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
233 summary: 2
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
234
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
235 changeset: 1:4ca5088da217
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
236 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
237 date: Thu Jan 01 00:00:01 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
238 summary: 1
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
239
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
240 changeset: 0:33b1f9bc8bc5
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
241 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
242 date: Thu Jan 01 00:00:00 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
243 summary: 0
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
244
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
245
6859
9369095779a1 add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff changeset
246 hg up -C
9369095779a1 add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff changeset
247
11860
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
248 $ hg up -C
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
249 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
250
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
251 complex bisect test 1 # first bad rev is 9
6859
9369095779a1 add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff changeset
252
11860
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
253 $ hg bisect -r
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
254 $ hg bisect -g 0
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
255 $ hg bisect -b 17 # -> update to rev 6
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
256 Testing changeset 6:a214d5d3811a (15 changesets remaining, ~3 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
257 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
258 $ hg bisect -g # -> update to rev 13
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
259 Testing changeset 13:b0a32c86eb31 (9 changesets remaining, ~3 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
260 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
261 $ hg bisect -s # -> update to rev 10
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
262 Testing changeset 10:429fcd26f52d (9 changesets remaining, ~3 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
263 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
264 $ hg bisect -b # -> update to rev 8
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
265 Testing changeset 8:dab8161ac8fc (3 changesets remaining, ~1 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
266 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
267 $ hg bisect -g # -> update to rev 9
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
268 Testing changeset 9:3c77083deb4a (2 changesets remaining, ~1 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
269 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
270 $ hg bisect -b
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
271 The first bad revision is:
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
272 changeset: 9:3c77083deb4a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
273 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
274 date: Thu Jan 01 00:00:09 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
275 summary: 9
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
276
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
277
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
278 complex bisect test 2 # first good rev is 13
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
279
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
280 $ hg bisect -r
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
281 $ hg bisect -g 18
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
282 $ hg bisect -b 1 # -> update to rev 6
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
283 Testing changeset 6:a214d5d3811a (13 changesets remaining, ~3 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
284 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
285 $ hg bisect -s # -> update to rev 10
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
286 Testing changeset 10:429fcd26f52d (13 changesets remaining, ~3 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
287 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
288 $ hg bisect -b # -> update to rev 12
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
289 Testing changeset 12:9f259202bbe7 (5 changesets remaining, ~2 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
290 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
291 $ hg bisect -b # -> update to rev 13
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
292 Testing changeset 13:b0a32c86eb31 (3 changesets remaining, ~1 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
293 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
294 $ hg bisect -g
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
295 The first good revision is:
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
296 changeset: 13:b0a32c86eb31
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
297 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
298 date: Thu Jan 01 00:00:13 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
299 summary: 13
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
300
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
301
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
302 complex bisect test 3
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
303
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
304 first bad rev is 15
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
305 10,9,13 are skipped an might be the first bad revisions as well
6859
9369095779a1 add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff changeset
306
11860
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
307 $ hg bisect -r
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
308 $ hg bisect -g 1
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
309 $ hg bisect -b 16 # -> update to rev 6
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
310 Testing changeset 6:a214d5d3811a (13 changesets remaining, ~3 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
311 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
312 $ hg bisect -g # -> update to rev 13
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
313 Testing changeset 13:b0a32c86eb31 (8 changesets remaining, ~3 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
314 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
315 $ hg bisect -s # -> update to rev 10
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
316 Testing changeset 10:429fcd26f52d (8 changesets remaining, ~3 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
317 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
318 $ hg bisect -s # -> update to rev 12
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
319 Testing changeset 12:9f259202bbe7 (8 changesets remaining, ~3 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
320 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
321 $ hg bisect -g # -> update to rev 9
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
322 Testing changeset 9:3c77083deb4a (5 changesets remaining, ~2 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
323 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
324 $ hg bisect -s # -> update to rev 15
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
325 Testing changeset 15:857b178a7cf3 (5 changesets remaining, ~2 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
326 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
327 $ hg bisect -b
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
328 Due to skipped revisions, the first bad revision could be any of:
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
329 changeset: 9:3c77083deb4a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
330 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
331 date: Thu Jan 01 00:00:09 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
332 summary: 9
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
333
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
334 changeset: 10:429fcd26f52d
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
335 parent: 9:3c77083deb4a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
336 parent: 6:a214d5d3811a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
337 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
338 date: Thu Jan 01 00:00:10 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
339 summary: merge 6,9
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
340
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
341 changeset: 13:b0a32c86eb31
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
342 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
343 date: Thu Jan 01 00:00:13 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
344 summary: 13
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
345
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
346 changeset: 15:857b178a7cf3
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
347 parent: 13:b0a32c86eb31
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
348 parent: 10:429fcd26f52d
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
349 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
350 date: Thu Jan 01 00:00:15 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
351 summary: merge 10,13
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
352
6859
9369095779a1 add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff changeset
353
11860
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
354 complex bisect test 4
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
355
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
356 first good revision is 17
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
357 15,16 are skipped an might be the first good revisions as well
6859
9369095779a1 add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff changeset
358
11860
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
359 $ hg bisect -r
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
360 $ hg bisect -g 17
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
361 $ hg bisect -b 8 # -> update to rev 10
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
362 Testing changeset 13:b0a32c86eb31 (8 changesets remaining, ~3 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
363 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
364 $ hg bisect -b # -> update to rev 13
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
365 Testing changeset 10:429fcd26f52d (5 changesets remaining, ~2 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
366 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
367 $ hg bisect -b # -> update to rev 15
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
368 Testing changeset 15:857b178a7cf3 (3 changesets remaining, ~1 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
369 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
370 $ hg bisect -s # -> update to rev 16
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
371 Testing changeset 16:609d82a7ebae (3 changesets remaining, ~1 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
372 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
373 $ hg bisect -s
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
374 Due to skipped revisions, the first good revision could be any of:
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
375 changeset: 15:857b178a7cf3
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
376 parent: 13:b0a32c86eb31
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
377 parent: 10:429fcd26f52d
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
378 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
379 date: Thu Jan 01 00:00:15 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
380 summary: merge 10,13
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
381
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
382 changeset: 16:609d82a7ebae
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
383 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
384 date: Thu Jan 01 00:00:16 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
385 summary: 16
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
386
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
387 changeset: 17:228c06deef46
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
388 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
389 date: Thu Jan 01 00:00:17 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
390 summary: 17
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
391