comparison tests/test-evolve-obshistory-split.t @ 4363:a2fdbece7ce1 mercurial-4.4

test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 22 Jan 2019 12:57:25 -0500
parents d00f0c369bc7 8bd60e09dfb4
children f54bb6eaf5e6
comparison
equal deleted inserted replaced
4362:8bd60e09dfb4 4363:a2fdbece7ce1
201 $ hg update 471597cad322 201 $ hg update 471597cad322
202 abort: hidden revision '471597cad322'! 202 abort: hidden revision '471597cad322'!
203 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a) 203 (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a)
204 [255] 204 [255]
205 $ hg update --hidden 'min(desc(A0))' 205 $ hg update --hidden 'min(desc(A0))'
206 updating to a hidden changeset 471597cad322
207 (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
208 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 206 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
209 working directory parent is obsolete! (471597cad322) 207 working directory parent is obsolete! (471597cad322)
210 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) 208 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
211 209
212 Check output on the server side 210 Check output on the server side