Mercurial > evolve

comparison tests/test-evolve-content-divergent-stack.t @ 6074:55e9987b8384 mercurial-4.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.8 into mercurial-4.7 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 12 Oct 2021 14:04:23 +0300
parents be8f7eb3f3a0 c0921b5277a0
children
comparison
equal deleted inserted replaced
6073:6b67f26f4667 6074:55e9987b8384
45 requesting all changes 45 requesting all changes
46 adding changesets 46 adding changesets
47 adding manifests 47 adding manifests
48 adding file changes 48 adding file changes
49 added 5 changesets with 5 changes to 5 files 49 added 5 changesets with 5 changes to 5 files
50 new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts) 50 new changesets 8fa14d15e168:c41c793e0ef1
51 (run 'hg update' to get a working copy) 51 (run 'hg update' to get a working copy)
52 $ hg glog 52 $ hg glog
53 o 4:c41c793e0ef1 added d 53 o 4:c41c793e0ef1 added d
54 | () [default] draft 54 | () [default] draft
55 o 3:ca1b80f7960a added c 55 o 3:ca1b80f7960a added c
115 adding manifests 115 adding manifests
116 adding file changes 116 adding file changes
117 added 4 changesets with 0 changes to 4 files (+1 heads) 117 added 4 changesets with 0 changes to 4 files (+1 heads)
118 5 new obsolescence markers 118 5 new obsolescence markers
119 8 new content-divergent changesets 119 8 new content-divergent changesets
120 new changesets 82b74d5dc678:15c781f93cac (4 drafts) 120 new changesets 82b74d5dc678:15c781f93cac
121 (run 'hg heads' to see heads, 'hg merge' to merge) 121 (run 'hg heads' to see heads, 'hg merge' to merge)
122 122
123 $ hg glog 123 $ hg glog
124 * 12:15c781f93cac added d 124 * 12:15c781f93cac added d
125 | () [default] draft 125 | () [default] draft
368 requesting all changes 368 requesting all changes
369 adding changesets 369 adding changesets
370 adding manifests 370 adding manifests
371 adding file changes 371 adding file changes
372 added 5 changesets with 5 changes to 5 files 372 added 5 changesets with 5 changes to 5 files
373 new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts) 373 new changesets 8fa14d15e168:c41c793e0ef1
374 (run 'hg update' to get a working copy) 374 (run 'hg update' to get a working copy)
375 375
376 $ hg glog 376 $ hg glog
377 o 4:c41c793e0ef1 added d 377 o 4:c41c793e0ef1 added d
378 | () [default] draft 378 | () [default] draft
442 adding manifests 442 adding manifests
443 adding file changes 443 adding file changes
444 added 5 changesets with 1 changes to 5 files (+1 heads) 444 added 5 changesets with 1 changes to 5 files (+1 heads)
445 4 new obsolescence markers 445 4 new obsolescence markers
446 8 new content-divergent changesets 446 8 new content-divergent changesets
447 new changesets 2228e3b74514:d45f050514c2 (5 drafts) 447 new changesets 2228e3b74514:d45f050514c2
448 (run 'hg heads' to see heads, 'hg merge' to merge) 448 (run 'hg heads' to see heads, 'hg merge' to merge)
449 449
450 $ hg glog 450 $ hg glog
451 * 13:d45f050514c2 added d 451 * 13:d45f050514c2 added d
452 | () [default] draft 452 | () [default] draft
1090 adding manifests 1090 adding manifests
1091 adding file changes 1091 adding file changes
1092 added 4 changesets with 1 changes to 5 files (+1 heads) 1092 added 4 changesets with 1 changes to 5 files (+1 heads)
1093 3 new obsolescence markers 1093 3 new obsolescence markers
1094 6 new content-divergent changesets 1094 6 new content-divergent changesets
1095 new changesets 9703820a7d5b:9a1f460df8b5 (4 drafts) 1095 new changesets 9703820a7d5b:9a1f460df8b5
1096 (run 'hg heads' to see heads, 'hg merge' to merge) 1096 (run 'hg heads' to see heads, 'hg merge' to merge)
1097 $ hg glog 1097 $ hg glog
1098 * 10:9a1f460df8b5 added dar 1098 * 10:9a1f460df8b5 added dar
1099 | () [default] draft 1099 | () [default] draft
1100 * 9:7dd5b9d42ef3 added bar and car 1100 * 9:7dd5b9d42ef3 added bar and car