Mercurial > evolve

comparison tests/test-evolve-content-divergence.t @ 4165:ccbfbeee6cf3 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: backed out test output changes from changeset ef22eef37ecc
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 12 Oct 2018 14:55:46 +0200
parents 4eb3877540f1
children e541acefbaa5 ab3581bc0637
comparison
equal deleted inserted replaced
4164:e2d083cc447e 4165:ccbfbeee6cf3
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 (5 drafts) 796 new changesets 8fa14d15e168:c41c793e0ef1
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 (4 drafts) 868 new changesets 82b74d5dc678:15c781f93cac
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