comparison tests/test-evolve-obshistory-amend.t @ 3923:257481642686 mercurial-4.6

test-compat: merge stable into mercurial-4.6
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 02 Aug 2018 01:57:13 +0200
parents f7afd3a158e3
children f3713d41b85b 769b907e644e
comparison
equal deleted inserted replaced
3922:9839463088ac 3923:257481642686
197 $ hg update 471f378eab4c 197 $ hg update 471f378eab4c
198 abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9! 198 abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9!
199 (use --hidden to access hidden revisions) 199 (use --hidden to access hidden revisions)
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)
202 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 204 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
203 updated to hidden changeset 471f378eab4c
204 (hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9)
205 working directory parent is obsolete! (471f378eab4c) 205 working directory parent is obsolete! (471f378eab4c)
206 (use 'hg evolve' to update to its successor: 4ae3a4151de9) 206 (use 'hg evolve' to update to its successor: 4ae3a4151de9)
207 207
208 Check output on the server side 208 Check output on the server side
209 ------------------------------- 209 -------------------------------