Mercurial > evolve
diff tests/test-single-head-obsolescence-named-branch-A2.t @ 5234:35e769c9604f mercurial-5.1
test-compat: merge mercurial-5.2 into mercurial-5.1
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Wed, 08 Apr 2020 01:16:53 +0800 |
parents | b20d04641c0f |
children | df773a9bed0c |
line wrap: on
line diff
--- a/tests/test-single-head-obsolescence-named-branch-A2.t Wed Apr 08 01:16:51 2020 +0800 +++ b/tests/test-single-head-obsolescence-named-branch-A2.t Wed Apr 08 01:16:53 2020 +0800 @@ -72,7 +72,6 @@ created new head (consider using topic for lightweight branches. See 'hg help topic') $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` - 1 new obsolescence markers obsoleted 1 changesets 2 new orphan changesets $ hg log -G --hidden @@ -100,6 +99,8 @@ adding changesets adding manifests adding file changes + added 1 changesets with 1 changes to 1 files (+1 heads) + 1 new obsolescence markers transaction abort! rollback completed abort: rejecting multiple heads on branch "default"