comparison tests/test-evolve-templates.t @ 5158:8d20c0af010a mercurial-5.1

test-compat: merge mercurial-5.2 into mercurial-5.1
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 28 Feb 2020 23:10:48 +0700
parents f3e39a354378 900668a93629
children e5fe3ca5e6ad e8542915d0f7
comparison
equal deleted inserted replaced
5157:f4f2cc332bb7 5158:8d20c0af010a
1105 created new head 1105 created new head
1106 1106
1107 Create the cycle 1107 Create the cycle
1108 1108
1109 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"` 1109 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
1110 1 new obsolescence markers
1111 obsoleted 1 changesets 1110 obsoleted 1 changesets
1112 1 new orphan changesets 1111 1 new orphan changesets
1113 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` 1112 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
1114 1 new obsolescence markers
1115 obsoleted 1 changesets 1113 obsoleted 1 changesets
1116 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"` 1114 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
1117 1 new obsolescence markers
1118 1115
1119 Check templates 1116 Check templates
1120 --------------- 1117 ---------------
1121 1118
1122 $ hg tlog 1119 $ hg tlog
1291 user: test 1288 user: test
1292 date: Thu Jan 01 00:00:00 1970 +0000 1289 date: Thu Jan 01 00:00:00 1970 +0000
1293 summary: ROOT 1290 summary: ROOT
1294 1291
1295 $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"` 1292 $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"`
1296 1 new obsolescence markers
1297 obsoleted 1 changesets 1293 obsoleted 1 changesets
1298 $ hg log -G 1294 $ hg log -G
1299 @ changeset: 7:ba2ed02b0c9a 1295 @ changeset: 7:ba2ed02b0c9a
1300 | tag: tip 1296 | tag: tip
1301 | user: test 1297 | user: test