comparison tests/test-evolve-obshistory-amend.t @ 3935:9af0e2b0bdd7 mercurial-4.4

test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 03 Aug 2018 00:19:47 +0200
parents d00f0c369bc7
children 537fd9a86c06
comparison
equal deleted inserted replaced
3934:d55a6fef9eb9 3935:9af0e2b0bdd7
197 $ hg update 471f378eab4c 197 $ hg update 471f378eab4c
198 abort: hidden revision '471f378eab4c'! 198 abort: hidden revision '471f378eab4c'!
199 (use --hidden to access hidden revisions; successor: 4ae3a4151de9) 199 (use --hidden to access hidden revisions; successor: 4ae3a4151de9)
200 [255] 200 [255]
201 $ hg update --hidden "desc(A0)" 201 $ hg update --hidden "desc(A0)"
202 updating to a hidden changeset 471f378eab4c
203 (hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9)
204 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 202 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
205 working directory parent is obsolete! (471f378eab4c) 203 working directory parent is obsolete! (471f378eab4c)
206 (use 'hg evolve' to update to its successor: 4ae3a4151de9) 204 (use 'hg evolve' to update to its successor: 4ae3a4151de9)
207 205
208 Check output on the server side 206 Check output on the server side