Mercurial > evolve
diff tests/test-evolve-content-divergent-stack.t @ 6074:55e9987b8384 mercurial-4.7
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 |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-stack.t Tue Oct 12 13:46:30 2021 +0300 +++ b/tests/test-evolve-content-divergent-stack.t Tue Oct 12 14:04:23 2021 +0300 @@ -47,7 +47,7 @@ adding manifests adding file changes added 5 changesets with 5 changes to 5 files - new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts) + new changesets 8fa14d15e168:c41c793e0ef1 (run 'hg update' to get a working copy) $ hg glog o 4:c41c793e0ef1 added d @@ -117,7 +117,7 @@ added 4 changesets with 0 changes to 4 files (+1 heads) 5 new obsolescence markers 8 new content-divergent changesets - new changesets 82b74d5dc678:15c781f93cac (4 drafts) + new changesets 82b74d5dc678:15c781f93cac (run 'hg heads' to see heads, 'hg merge' to merge) $ hg glog @@ -370,7 +370,7 @@ adding manifests adding file changes added 5 changesets with 5 changes to 5 files - new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts) + new changesets 8fa14d15e168:c41c793e0ef1 (run 'hg update' to get a working copy) $ hg glog @@ -444,7 +444,7 @@ added 5 changesets with 1 changes to 5 files (+1 heads) 4 new obsolescence markers 8 new content-divergent changesets - new changesets 2228e3b74514:d45f050514c2 (5 drafts) + new changesets 2228e3b74514:d45f050514c2 (run 'hg heads' to see heads, 'hg merge' to merge) $ hg glog @@ -1092,7 +1092,7 @@ added 4 changesets with 1 changes to 5 files (+1 heads) 3 new obsolescence markers 6 new content-divergent changesets - new changesets 9703820a7d5b:9a1f460df8b5 (4 drafts) + new changesets 9703820a7d5b:9a1f460df8b5 (run 'hg heads' to see heads, 'hg merge' to merge) $ hg glog * 10:9a1f460df8b5 added dar