Mercurial > evolve
comparison tests/test-evolve-content-divergence.t @ 4197:1dd5c6e6cd53 stable
test-compat: backed out changeset ccbfbeee6cf3
Preparing the branch for 4.8.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 25 Oct 2018 12:53:48 +0200 |
| parents | ccbfbeee6cf3 |
| children | f555039d1a08 450487b4e1a3 1fdecdfd0df9 |
comparison
equal
deleted
inserted
replaced
| 4196:f21a9aac3add | 4197:1dd5c6e6cd53 |
|---|---|
| 791 requesting all changes | 791 requesting all changes |
| 792 adding changesets | 792 adding changesets |
| 793 adding manifests | 793 adding manifests |
| 794 adding file changes | 794 adding file changes |
| 795 added 5 changesets with 5 changes to 5 files | 795 added 5 changesets with 5 changes to 5 files |
| 796 new changesets 8fa14d15e168:c41c793e0ef1 | 796 new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts) |
| 797 (run 'hg update' to get a working copy) | 797 (run 'hg update' to get a working copy) |
| 798 $ hg glog | 798 $ hg glog |
| 799 o 4:c41c793e0ef1 added d | 799 o 4:c41c793e0ef1 added d |
| 800 | () [default] draft | 800 | () [default] draft |
| 801 o 3:ca1b80f7960a added c | 801 o 3:ca1b80f7960a added c |
| 863 adding manifests | 863 adding manifests |
| 864 adding file changes | 864 adding file changes |
| 865 added 4 changesets with 0 changes to 4 files (+1 heads) | 865 added 4 changesets with 0 changes to 4 files (+1 heads) |
| 866 5 new obsolescence markers | 866 5 new obsolescence markers |
| 867 8 new content-divergent changesets | 867 8 new content-divergent changesets |
| 868 new changesets 82b74d5dc678:15c781f93cac | 868 new changesets 82b74d5dc678:15c781f93cac (4 drafts) |
| 869 (run 'hg heads' to see heads, 'hg merge' to merge) | 869 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 870 | 870 |
| 871 $ hg glog | 871 $ hg glog |
| 872 * 12:15c781f93cac added d | 872 * 12:15c781f93cac added d |
| 873 | () [default] draft | 873 | () [default] draft |