comparison tests/test-evolve-obshistory-split.t @ 4784:ecf0f3bc7468 mercurial-4.6

test-compat: merge mercurial-4.7 into mercurial-4.6
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 29 Jul 2019 14:43:17 +0200
parents d70db7e455dc ff452675566c
children f7bf347a17bb 1752a2e7a226
comparison
equal deleted inserted replaced
4783:5d50f3de4714 4784:ecf0f3bc7468
201 $ hg update 471597cad322 201 $ hg update 471597cad322
202 abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a! 202 abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a!
203 (use --hidden to access hidden revisions) 203 (use --hidden to access hidden revisions)
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)
206 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 208 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
207 updated to hidden changeset 471597cad322
208 (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
209 working directory parent is obsolete! (471597cad322) 209 working directory parent is obsolete! (471597cad322)
210 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) 210 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
211 211
212 Check output on the server side 212 Check output on the server side
213 ------------------------------- 213 -------------------------------