Mercurial > hg

comparison tests/test-merge7.t @ 49252:4141951dacff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
debugindex: rename the parent column to mention nodeid We will add new columns with the "revnum" version of the parent. It will be useful in case we need to inspect a corrupted revlog index.
author Pierre-Yves DAVID <pierre-yves.david@octobus.net>
date Wed, 01 Jun 2022 01:13:13 +0200
parents ccd76e292be5
children
comparison
equal deleted inserted replaced
49251:ccd76e292be5 49252:4141951dacff
103 two-point-one 103 two-point-one
104 >>>>>>> merge rev: 40d11a4173a8 - test: two -> two-point-one 104 >>>>>>> merge rev: 40d11a4173a8 - test: two -> two-point-one
105 three 105 three
106 106
107 $ hg debugindex test.txt 107 $ hg debugindex test.txt
108 rev linkrev nodeid p1 p2 108 rev linkrev nodeid p1-nodeid p2-nodeid
109 0 0 01365c4cca56 000000000000 000000000000 109 0 0 01365c4cca56 000000000000 000000000000
110 1 1 7b013192566a 01365c4cca56 000000000000 110 1 1 7b013192566a 01365c4cca56 000000000000
111 2 2 8fe46a3eb557 01365c4cca56 000000000000 111 2 2 8fe46a3eb557 01365c4cca56 000000000000
112 3 3 fc3148072371 7b013192566a 8fe46a3eb557 112 3 3 fc3148072371 7b013192566a 8fe46a3eb557
113 4 4 d40249267ae3 8fe46a3eb557 000000000000 113 4 4 d40249267ae3 8fe46a3eb557 000000000000