comparison tests/test-evolve-obshistory-complex.t @ 2701:26ec0839865b mercurial-4.0

compat: merge with mercurial-4.1
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 02 Jul 2017 17:28:15 +0200
parents 44dd9d76afb2 6d48ad81e7b5
children 13c4d518327a
comparison
equal deleted inserted replaced
2700:52d5c5ce27e4 2701:26ec0839865b
78 @ changeset: 9:100cc25b765f 78 @ changeset: 9:100cc25b765f
79 | tag: tip 79 | tag: tip
80 | parent: 4:868d2e0eb19c 80 | parent: 4:868d2e0eb19c
81 | user: test 81 | user: test
82 | date: Thu Jan 01 00:00:00 1970 +0000 82 | date: Thu Jan 01 00:00:00 1970 +0000
83 | trouble: unstable
84 | summary: fold2 83 | summary: fold2
85 | 84 |
86 | o changeset: 8:d15d0ffc75f6 85 | o changeset: 8:d15d0ffc75f6
87 | | parent: 2:c473644ee0e9 86 | | parent: 2:c473644ee0e9
88 | | user: test 87 | | user: test
89 | | date: Thu Jan 01 00:00:00 1970 +0000 88 | | date: Thu Jan 01 00:00:00 1970 +0000
90 | | trouble: unstable
91 | | summary: fold1 89 | | summary: fold1
92 | | 90 | |
93 | | o changeset: 7:b868bc49b0a4 91 | | o changeset: 7:b868bc49b0a4
94 | | | parent: 0:ea207398892e 92 | | | parent: 0:ea207398892e
95 | | | user: test 93 | | | user: test
230 $ hg log -G 228 $ hg log -G
231 @ changeset: 15:d4a000f63ee9 229 @ changeset: 15:d4a000f63ee9
232 | tag: tip 230 | tag: tip
233 | user: test 231 | user: test
234 | date: Thu Jan 01 00:00:00 1970 +0000 232 | date: Thu Jan 01 00:00:00 1970 +0000
235 | trouble: unstable
236 | summary: fold2 233 | summary: fold2
237 | 234 |
238 o changeset: 14:ec31316faa9d 235 o changeset: 14:ec31316faa9d
239 | parent: 4:868d2e0eb19c 236 | parent: 4:868d2e0eb19c
240 | user: test 237 | user: test
241 | date: Thu Jan 01 00:00:00 1970 +0000 238 | date: Thu Jan 01 00:00:00 1970 +0000
242 | trouble: unstable
243 | summary: fold2 239 | summary: fold2
244 | 240 |
245 | o changeset: 13:d0f33db50670 241 | o changeset: 13:d0f33db50670
246 | | user: test 242 | | user: test
247 | | date: Thu Jan 01 00:00:00 1970 +0000 243 | | date: Thu Jan 01 00:00:00 1970 +0000
248 | | trouble: unstable
249 | | summary: fold1 244 | | summary: fold1
250 | | 245 | |
251 | o changeset: 12:7b3290f6e0a0 246 | o changeset: 12:7b3290f6e0a0
252 | | parent: 2:c473644ee0e9 247 | | parent: 2:c473644ee0e9
253 | | user: test 248 | | user: test
254 | | date: Thu Jan 01 00:00:00 1970 +0000 249 | | date: Thu Jan 01 00:00:00 1970 +0000
255 | | trouble: unstable
256 | | summary: fold1 250 | | summary: fold1
257 | | 251 | |
258 | | o changeset: 11:e036916b63ea 252 | | o changeset: 11:e036916b63ea
259 | | | user: test 253 | | | user: test
260 | | | date: Thu Jan 01 00:00:00 1970 +0000 254 | | | date: Thu Jan 01 00:00:00 1970 +0000
302 $ hg log -G 296 $ hg log -G
303 @ changeset: 15:d4a000f63ee9 297 @ changeset: 15:d4a000f63ee9
304 | tag: tip 298 | tag: tip
305 | user: test 299 | user: test
306 | date: Thu Jan 01 00:00:00 1970 +0000 300 | date: Thu Jan 01 00:00:00 1970 +0000
307 | trouble: unstable
308 | summary: fold2 301 | summary: fold2
309 | 302 |
310 o changeset: 14:ec31316faa9d 303 o changeset: 14:ec31316faa9d
311 | parent: 4:868d2e0eb19c 304 | parent: 4:868d2e0eb19c
312 | user: test 305 | user: test
313 | date: Thu Jan 01 00:00:00 1970 +0000 306 | date: Thu Jan 01 00:00:00 1970 +0000
314 | trouble: unstable
315 | summary: fold2 307 | summary: fold2
316 | 308 |
317 | o changeset: 12:7b3290f6e0a0 309 | o changeset: 12:7b3290f6e0a0
318 | | parent: 2:c473644ee0e9 310 | | parent: 2:c473644ee0e9
319 | | user: test 311 | | user: test
320 | | date: Thu Jan 01 00:00:00 1970 +0000 312 | | date: Thu Jan 01 00:00:00 1970 +0000
321 | | trouble: unstable
322 | | summary: fold1 313 | | summary: fold1
323 | | 314 | |
324 | | o changeset: 10:19e14c8397fc 315 | | o changeset: 10:19e14c8397fc
325 | | | parent: 0:ea207398892e 316 | | | parent: 0:ea207398892e
326 | | | user: test 317 | | | user: test