diff tests/test-narrow-shallow-merges.t @ 47504:411dc27fd9fd stable 5.8.1

corruption: backout changeset 49fd21f32695 (issue6528) inverting the parent is masking copy information leading to bad content being fetched and bad status result. Since 49fd21f32695, exchange can actively swap these parent corrupting existing changesets and triggering the corruption. Data corruption are considered critical so backing this out and doing and unscheduled release seems in order. Differential Revision: https://phab.mercurial-scm.org/D10995
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 06 Jul 2021 16:12:09 +0200
parents 49fd21f32695
children 5b65721a75eb
line wrap: on
line diff
--- a/tests/test-narrow-shallow-merges.t	Tue Jul 06 19:22:50 2021 +0200
+++ b/tests/test-narrow-shallow-merges.t	Tue Jul 06 16:12:09 2021 +0200
@@ -179,7 +179,7 @@
   
 
   $ hg log -T '{if(ellipsis,"...")}{node|short} {p1node|short} {p2node|short} {desc}\n' | sort
-  ...2a20009de83e 3ac1f5779de3 000000000000 outside 10
+  ...2a20009de83e 000000000000 3ac1f5779de3 outside 10
   ...3ac1f5779de3 bb96a08b062a 465567bdfb2d merge a/b/c/d 9
   ...8d874d57adea 7ef88b4dd4fa 000000000000 outside 12
   ...b844052e7b3b 000000000000 000000000000 outside 2c