comparison tests/test-evolve-obshistory-amend-then-fold.t @ 3924:f3713d41b85b mercurial-4.5

test-compat: merge mercurial-4.6 into mercurial-4.5
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 02 Aug 2018 01:58:44 +0200
parents f7afd3a158e3
children d00f0c369bc7
comparison
equal deleted inserted replaced
3923:257481642686 3924:f3713d41b85b
225 "rev": 1, 225 "rev": 1,
226 "shortdescription": "A0" 226 "shortdescription": "A0"
227 } 227 }
228 ] 228 ]
229 $ hg update 471f378eab4c 229 $ hg update 471f378eab4c
230 abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192! 230 abort: hidden revision '471f378eab4c'!
231 (use --hidden to access hidden revisions) 231 (use --hidden to access hidden revisions; successor: eb5a0daa2192)
232 [255] 232 [255]
233 $ hg update --hidden 'desc(A0)' 233 $ hg update --hidden 'desc(A0)'
234 updating to a hidden changeset 471f378eab4c 234 updating to a hidden changeset 471f378eab4c
235 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192) 235 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
236 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 236 0 files updated, 0 files merged, 1 files removed, 0 files unresolved