annotate tests/test-bisect2.t @ 12830:d8205dacf9a3 stable

wix: add subrepos help text
author Steve Borho <steve@borho.org>
date Mon, 25 Oct 2010 10:07:54 -0500
parents 4134686b83e1
children 0388e3e36693
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
11860
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
26 init
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
27
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
28 $ hg init
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
29
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
30 committing changes
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
31
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
32 $ echo > a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
33 $ echo '0' >> a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
34 $ hg add a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
35 $ hg ci -m "0" -d "0 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
36 $ echo '1' >> a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
37 $ hg ci -m "1" -d "1 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
38 $ echo '2' >> a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
39 $ hg ci -m "2" -d "2 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
40 $ echo '3' >> a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
41 $ hg ci -m "3" -d "3 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
42 $ echo '4' >> a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
43 $ hg ci -m "4" -d "4 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
44
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
45 create branch
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
46
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
47 $ hg up -r 2
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
48 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
49 $ echo '5' >> b
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
50 $ hg add b
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
51 $ hg ci -m "5" -d "5 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
52 created new head
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
53
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
54 merge
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
55
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
56 $ hg merge
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
57 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
58 (branch merge, don't forget to commit)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
59 $ hg ci -m "merge 4,5" -d "6 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
60
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
61 create branch
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
62
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
63 $ hg up -r 4
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
64 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
65 $ echo '7' > c
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
66 $ hg add c
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
67 $ hg ci -m "7" -d "7 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
68 created new head
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
69
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
70 create branch
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
71
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
72 $ hg up -r 1
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
73 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
74 $ echo '8' > d
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
75 $ hg add d
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
76 $ hg ci -m "8" -d "8 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
77 created new head
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
78 $ echo '9' >> d
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
79 $ hg ci -m "9" -d "9 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
80
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
81 merge
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
82
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
83 $ hg merge -r 6
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
84 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
85 (branch merge, don't forget to commit)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
86 $ hg ci -m "merge 6,9" -d "10 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
87
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
88 create branch
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
89
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
90 $ hg up -r 8
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
91 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
92 $ echo '11' > e
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
93 $ hg add e
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
94 $ hg ci -m "11" -d "11 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
95 created new head
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
96 $ echo '12' >> e
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
97 $ hg ci -m "12" -d "12 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
98 $ echo '13' >> e
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
99 $ hg ci -m "13" -d "13 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
100
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
101 create branch
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
102
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
103 $ hg up -r 11
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
104 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
105 $ echo '14' > f
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
106 $ hg add f
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
107 $ hg ci -m "14" -d "14 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
108 created new head
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
109
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
110 merge
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
111
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
112 $ hg up -r 13 -C
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
113 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
114 $ hg merge -r 10
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
115 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
116 (branch merge, don't forget to commit)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
117 $ hg ci -m "merge 10,13" -d "15 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
118 $ echo '16' >> e
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
119 $ hg ci -m "16" -d "16 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
120 $ echo '17' >> e
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
121 $ hg ci -m "17" -d "17 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
122
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
123 create branch
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
124
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
125 $ hg up -r 15
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
126 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
127 $ echo '18' >> e
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
128 $ hg ci -m "18" -d "18 0"
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
129 created new head
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
130
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
131 log
6859
9369095779a1 add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff changeset
132
11860
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
133 $ hg log
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
134 changeset: 18:d42e18c7bc9b
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
135 tag: tip
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
136 parent: 15:857b178a7cf3
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
137 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
138 date: Thu Jan 01 00:00:18 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
139 summary: 18
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
140
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
141 changeset: 17:228c06deef46
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
142 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
143 date: Thu Jan 01 00:00:17 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
144 summary: 17
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
145
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
146 changeset: 16:609d82a7ebae
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
147 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
148 date: Thu Jan 01 00:00:16 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
149 summary: 16
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
150
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
151 changeset: 15:857b178a7cf3
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
152 parent: 13:b0a32c86eb31
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
153 parent: 10:429fcd26f52d
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
154 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
155 date: Thu Jan 01 00:00:15 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
156 summary: merge 10,13
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
157
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
158 changeset: 14:faa450606157
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
159 parent: 11:82ca6f06eccd
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
160 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
161 date: Thu Jan 01 00:00:14 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
162 summary: 14
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
163
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
164 changeset: 13:b0a32c86eb31
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
165 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
166 date: Thu Jan 01 00:00:13 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
167 summary: 13
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
168
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
169 changeset: 12:9f259202bbe7
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
170 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
171 date: Thu Jan 01 00:00:12 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
172 summary: 12
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
173
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
174 changeset: 11:82ca6f06eccd
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
175 parent: 8:dab8161ac8fc
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
176 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
177 date: Thu Jan 01 00:00:11 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
178 summary: 11
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
179
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
180 changeset: 10:429fcd26f52d
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
181 parent: 9:3c77083deb4a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
182 parent: 6:a214d5d3811a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
183 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
184 date: Thu Jan 01 00:00:10 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
185 summary: merge 6,9
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
186
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
187 changeset: 9:3c77083deb4a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
188 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
189 date: Thu Jan 01 00:00:09 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
190 summary: 9
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
191
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
192 changeset: 8:dab8161ac8fc
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
193 parent: 1:4ca5088da217
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
194 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
195 date: Thu Jan 01 00:00:08 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
196 summary: 8
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
197
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
198 changeset: 7:50c76098bbf2
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
199 parent: 4:5c668c22234f
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
200 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
201 date: Thu Jan 01 00:00:07 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
202 summary: 7
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
203
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
204 changeset: 6:a214d5d3811a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
205 parent: 5:385a529b6670
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
206 parent: 4:5c668c22234f
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
207 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
208 date: Thu Jan 01 00:00:06 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
209 summary: merge 4,5
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
210
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
211 changeset: 5:385a529b6670
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
212 parent: 2:051e12f87bf1
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
213 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
214 date: Thu Jan 01 00:00:05 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
215 summary: 5
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
216
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
217 changeset: 4:5c668c22234f
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
218 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
219 date: Thu Jan 01 00:00:04 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
220 summary: 4
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
221
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
222 changeset: 3:0950834f0a9c
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
223 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
224 date: Thu Jan 01 00:00:03 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
225 summary: 3
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
226
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
227 changeset: 2:051e12f87bf1
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
228 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
229 date: Thu Jan 01 00:00:02 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
230 summary: 2
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
231
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
232 changeset: 1:4ca5088da217
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
233 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
234 date: Thu Jan 01 00:00:01 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
235 summary: 1
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
236
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
237 changeset: 0:33b1f9bc8bc5
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
238 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
239 date: Thu Jan 01 00:00:00 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
240 summary: 0
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
241
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
242
6859
9369095779a1 add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff changeset
243 hg up -C
9369095779a1 add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff changeset
244
11860
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
245 $ hg up -C
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
246 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
247
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
248 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
249
11860
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
250 $ hg bisect -r
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
251 $ hg bisect -g 0
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
252 $ hg bisect -b 17 # -> update to rev 6
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
253 Testing changeset 6:a214d5d3811a (15 changesets remaining, ~3 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
254 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
255 $ hg bisect -g # -> update to rev 13
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
256 Testing changeset 13:b0a32c86eb31 (9 changesets remaining, ~3 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
257 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
258 $ hg bisect -s # -> update to rev 10
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
259 Testing changeset 10:429fcd26f52d (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 -b # -> update to rev 8
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
262 Testing changeset 8:dab8161ac8fc (3 changesets remaining, ~1 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
263 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
264 $ hg bisect -g # -> update to rev 9
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
265 Testing changeset 9:3c77083deb4a (2 changesets remaining, ~1 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
266 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
267 $ hg bisect -b
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
268 The first bad revision is:
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
269 changeset: 9:3c77083deb4a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
270 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
271 date: Thu Jan 01 00:00:09 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
272 summary: 9
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
273
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
274
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
275 complex bisect test 2 # first good rev is 13
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 $ hg bisect -r
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
278 $ hg bisect -g 18
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
279 $ hg bisect -b 1 # -> update to rev 6
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
280 Testing changeset 6:a214d5d3811a (13 changesets remaining, ~3 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
281 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
282 $ hg bisect -s # -> update to rev 10
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
283 Testing changeset 10:429fcd26f52d (13 changesets remaining, ~3 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
284 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
285 $ hg bisect -b # -> update to rev 12
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
286 Testing changeset 12:9f259202bbe7 (5 changesets remaining, ~2 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
287 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
288 $ hg bisect -b # -> update to rev 13
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
289 Testing changeset 13:b0a32c86eb31 (3 changesets remaining, ~1 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
290 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
291 $ hg bisect -g
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
292 The first good revision is:
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
293 changeset: 13:b0a32c86eb31
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
294 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
295 date: Thu Jan 01 00:00:13 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
296 summary: 13
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
297
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
298
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
299 complex bisect test 3
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 first bad rev is 15
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
302 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
303
11860
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
304 $ hg bisect -r
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
305 $ hg bisect -g 1
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
306 $ hg bisect -b 16 # -> update to rev 6
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
307 Testing changeset 6:a214d5d3811a (13 changesets remaining, ~3 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
308 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
309 $ hg bisect -g # -> update to rev 13
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
310 Testing changeset 13:b0a32c86eb31 (8 changesets remaining, ~3 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
311 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
312 $ hg bisect -s # -> update to rev 10
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
313 Testing changeset 10:429fcd26f52d (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 12
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
316 Testing changeset 12:9f259202bbe7 (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 -g # -> update to rev 9
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
319 Testing changeset 9:3c77083deb4a (5 changesets remaining, ~2 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
320 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
321 $ hg bisect -s # -> update to rev 15
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
322 Testing changeset 15:857b178a7cf3 (5 changesets remaining, ~2 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
323 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
324 $ hg bisect -b
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
325 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
326 changeset: 9:3c77083deb4a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
327 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
328 date: Thu Jan 01 00:00:09 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
329 summary: 9
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
330
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
331 changeset: 10:429fcd26f52d
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
332 parent: 9:3c77083deb4a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
333 parent: 6:a214d5d3811a
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
334 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
335 date: Thu Jan 01 00:00:10 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
336 summary: merge 6,9
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
337
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
338 changeset: 13:b0a32c86eb31
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
339 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
340 date: Thu Jan 01 00:00:13 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
341 summary: 13
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
342
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
343 changeset: 15:857b178a7cf3
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
344 parent: 13:b0a32c86eb31
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
345 parent: 10:429fcd26f52d
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
346 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
347 date: Thu Jan 01 00:00:15 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
348 summary: merge 10,13
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
349
6859
9369095779a1 add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff changeset
350
11860
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
351 complex bisect test 4
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
352
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
353 first good revision is 17
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
354 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
355
11860
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
356 $ hg bisect -r
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
357 $ hg bisect -g 17
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
358 $ hg bisect -b 8 # -> update to rev 10
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
359 Testing changeset 13:b0a32c86eb31 (8 changesets remaining, ~3 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
360 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
361 $ hg bisect -b # -> update to rev 13
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
362 Testing changeset 10:429fcd26f52d (5 changesets remaining, ~2 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
363 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
364 $ hg bisect -b # -> update to rev 15
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
365 Testing changeset 15:857b178a7cf3 (3 changesets remaining, ~1 tests)
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
366 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
367 $ hg bisect -s # -> update to rev 16
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
368 Testing changeset 16:609d82a7ebae (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
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
371 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
372 changeset: 15:857b178a7cf3
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
373 parent: 13:b0a32c86eb31
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
374 parent: 10:429fcd26f52d
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
375 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
376 date: Thu Jan 01 00:00:15 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
377 summary: merge 10,13
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
378
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
379 changeset: 16:609d82a7ebae
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
380 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
381 date: Thu Jan 01 00:00:16 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
382 summary: 16
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
383
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
384 changeset: 17:228c06deef46
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
385 user: test
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
386 date: Thu Jan 01 00:00:17 1970 +0000
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
387 summary: 17
56c7c3209e1a tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents: 6859
diff changeset
388
12007
652f71b235bf bisect: add test for unrelated starting revisions
Matt Mackall <mpm@selenic.com>
parents: 11860
diff changeset
389
652f71b235bf bisect: add test for unrelated starting revisions
Matt Mackall <mpm@selenic.com>
parents: 11860
diff changeset
390 test unrelated revs:
652f71b235bf bisect: add test for unrelated starting revisions
Matt Mackall <mpm@selenic.com>
parents: 11860
diff changeset
391
652f71b235bf bisect: add test for unrelated starting revisions
Matt Mackall <mpm@selenic.com>
parents: 11860
diff changeset
392 $ hg bisect --reset
652f71b235bf bisect: add test for unrelated starting revisions
Matt Mackall <mpm@selenic.com>
parents: 11860
diff changeset
393 $ hg bisect -b 7
652f71b235bf bisect: add test for unrelated starting revisions
Matt Mackall <mpm@selenic.com>
parents: 11860
diff changeset
394 $ hg bisect -g 14
652f71b235bf bisect: add test for unrelated starting revisions
Matt Mackall <mpm@selenic.com>
parents: 11860
diff changeset
395 abort: starting revisions are not directly related
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12178
diff changeset
396 [255]
12007
652f71b235bf bisect: add test for unrelated starting revisions
Matt Mackall <mpm@selenic.com>
parents: 11860
diff changeset
397 $ hg bisect --reset
12178
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
398
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
399 end at merge: 17 bad, 11 good (but 9 is first bad)
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
400
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
401 $ hg bisect -r
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
402 $ hg bisect -b 17
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
403 $ hg bisect -g 11
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
404 Testing changeset 13:b0a32c86eb31 (5 changesets remaining, ~2 tests)
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
405 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
406 $ hg bisect -g
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
407 Testing changeset 15:857b178a7cf3 (3 changesets remaining, ~1 tests)
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
408 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
409 $ hg bisect -b
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
410 The first bad revision is:
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
411 changeset: 15:857b178a7cf3
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
412 parent: 13:b0a32c86eb31
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
413 parent: 10:429fcd26f52d
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
414 user: test
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
415 date: Thu Jan 01 00:00:15 1970 +0000
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
416 summary: merge 10,13
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
417
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
418 Not all ancestors of this changeset have been checked.
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
419 To check the other ancestors, start from the common ancestor, dab8161ac8fc.
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
420 $ hg bisect -g 8 # dab8161ac8fc
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
421 Testing changeset 9:3c77083deb4a (3 changesets remaining, ~1 tests)
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
422 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
423 $ hg bisect -b
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
424 The first bad revision is:
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
425 changeset: 9:3c77083deb4a
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
426 user: test
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
427 date: Thu Jan 01 00:00:09 1970 +0000
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
428 summary: 9
1ef9b0b5efec bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 12007
diff changeset
429