comparison tests/test-evolve-obshistory-split.t @ 3933:1194c850fe2a mercurial-4.6

test-compat: merge stable into mercurial-4.6
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 03 Aug 2018 00:19:45 +0200
parents f7afd3a158e3
children f3713d41b85b 522abf1d70b7
comparison
equal deleted inserted replaced
3932:35b2d201eb71 3933:1194c850fe2a
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 -------------------------------