Mercurial > evolve

comparison tests/test-evolve-obshistory-lots-of-splits.t @ 3936:537fd9a86c06 mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.4 into mercurial-4.3
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 03 Aug 2018 00:22:50 +0200
parents d00f0c369bc7
children
comparison
equal deleted inserted replaced
3935:9af0e2b0bdd7 3936:537fd9a86c06
147 | summary: A0 147 | summary: A0
148 | 148 |
149 | x changeset: 1:de7290d8b885 149 | x changeset: 1:de7290d8b885
150 |/ user: test 150 |/ user: test
151 | date: Thu Jan 01 00:00:00 1970 +0000 151 | date: Thu Jan 01 00:00:00 1970 +0000
152 | obsolete: split using split as 2:337fec4d2edc, 3:f257fde29c7a, 4:1ae8bc733a14, 5:c7f044602e9b 152 | obsolete: split as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a
153 | summary: A0 153 | summary: A0
154 | 154 |
155 o changeset: 0:ea207398892e 155 o changeset: 0:ea207398892e
156 user: test 156 user: test
157 date: Thu Jan 01 00:00:00 1970 +0000 157 date: Thu Jan 01 00:00:00 1970 +0000
160 Actual test 160 Actual test
161 ----------- 161 -----------
162 162
163 $ hg obslog de7290d8b885 --hidden --patch 163 $ hg obslog de7290d8b885 --hidden --patch
164 x de7290d8b885 (1) A0 164 x de7290d8b885 (1) A0
165 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) 165 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
166 (No patch available, too many successors (4)) 166 (No patch available, too many successors (4))
167 167
168 $ hg obslog de7290d8b885 --hidden --all --patch 168 $ hg obslog de7290d8b885 --hidden --all --patch
169 o 1ae8bc733a14 (4) A0 169 o 1ae8bc733a14 (4) A0
170 | 170 |
173 | @ c7f044602e9b (5) A0 173 | @ c7f044602e9b (5) A0
174 |/ 174 |/
175 | o f257fde29c7a (3) A0 175 | o f257fde29c7a (3) A0
176 |/ 176 |/
177 x de7290d8b885 (1) A0 177 x de7290d8b885 (1) A0
178 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) 178 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
179 (No patch available, too many successors (4)) 179 (No patch available, too many successors (4))
180 180
181 $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool 181 $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool
182 [ 182 [
183 { 183 {
189 ], 189 ],
190 "effect": [ 190 "effect": [
191 "parent", 191 "parent",
192 "content" 192 "content"
193 ], 193 ],
194 "operation": "split",
195 "succnodes": [ 194 "succnodes": [
196 "1ae8bc733a14", 195 "1ae8bc733a14",
197 "337fec4d2edc", 196 "337fec4d2edc",
198 "c7f044602e9b", 197 "c7f044602e9b",
199 "f257fde29c7a" 198 "f257fde29c7a"
209 ] 208 ]
210 $ hg obslog c7f044602e9b --patch 209 $ hg obslog c7f044602e9b --patch
211 @ c7f044602e9b (5) A0 210 @ c7f044602e9b (5) A0
212 | 211 |
213 x de7290d8b885 (1) A0 212 x de7290d8b885 (1) A0
214 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) 213 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
215 (No patch available, too many successors (4)) 214 (No patch available, too many successors (4))
216 215
217 $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool 216 $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool
218 [ 217 [
219 { 218 {
231 ], 230 ],
232 "effect": [ 231 "effect": [
233 "parent", 232 "parent",
234 "content" 233 "content"
235 ], 234 ],
236 "operation": "split",
237 "succnodes": [ 235 "succnodes": [
238 "1ae8bc733a14", 236 "1ae8bc733a14",
239 "337fec4d2edc", 237 "337fec4d2edc",
240 "c7f044602e9b", 238 "c7f044602e9b",
241 "f257fde29c7a" 239 "f257fde29c7a"
258 | @ c7f044602e9b (5) A0 256 | @ c7f044602e9b (5) A0
259 |/ 257 |/
260 | o f257fde29c7a (3) A0 258 | o f257fde29c7a (3) A0
261 |/ 259 |/
262 x de7290d8b885 (1) A0 260 x de7290d8b885 (1) A0
263 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) 261 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
264 (No patch available, too many successors (4)) 262 (No patch available, too many successors (4))
265 263
266 $ hg obslog 5 --all --patch 264 $ hg obslog 5 --all --patch
267 o 1ae8bc733a14 (4) A0 265 o 1ae8bc733a14 (4) A0
268 | 266 |
271 | @ c7f044602e9b (5) A0 269 | @ c7f044602e9b (5) A0
272 |/ 270 |/
273 | o f257fde29c7a (3) A0 271 | o f257fde29c7a (3) A0
274 |/ 272 |/
275 x de7290d8b885 (1) A0 273 x de7290d8b885 (1) A0
276 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) 274 rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
277 (No patch available, too many successors (4)) 275 (No patch available, too many successors (4))
278 276
279 $ hg update de7290d8b885 277 $ hg update de7290d8b885
280 abort: hidden revision 'de7290d8b885'! 278 abort: hidden revision 'de7290d8b885'!
281 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more) 279 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more)