Mercurial > evolve

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 1752a2e7a226
comparison
equal deleted inserted replaced
3922:9839463088ac 3923:257481642686
35 user: test 35 user: test
36 date: Thu Jan 01 00:00:00 1970 +0000 36 date: Thu Jan 01 00:00:00 1970 +0000
37 summary: ROOT 37 summary: ROOT
38 38
39 $ hg update --hidden 'desc(A0)' 39 $ hg update --hidden 'desc(A0)'
40 updating to a hidden changeset 471f378eab4c
41 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
40 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 42 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
41 updated to hidden changeset 471f378eab4c
42 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
43 working directory parent is obsolete! (471f378eab4c) 43 working directory parent is obsolete! (471f378eab4c)
44 (use 'hg evolve' to update to its successor: fdf9bde5129a) 44 (use 'hg evolve' to update to its successor: fdf9bde5129a)
45 $ hg amend -m "A2" 45 $ hg amend -m "A2"
46 2 new content-divergent changesets 46 2 new content-divergent changesets
47 $ hg log --hidden -G 47 $ hg log --hidden -G
335 $ hg update 471f378eab4c 335 $ hg update 471f378eab4c
336 abort: hidden revision '471f378eab4c' has diverged! 336 abort: hidden revision '471f378eab4c' has diverged!
337 (use --hidden to access hidden revisions) 337 (use --hidden to access hidden revisions)
338 [255] 338 [255]
339 $ hg update --hidden 'desc(A0)' 339 $ hg update --hidden 'desc(A0)'
340 updating to a hidden changeset 471f378eab4c
341 (hidden revision '471f378eab4c' has diverged)
340 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 342 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
341 updated to hidden changeset 471f378eab4c
342 (hidden revision '471f378eab4c' has diverged)
343 working directory parent is obsolete! (471f378eab4c) 343 working directory parent is obsolete! (471f378eab4c)
344 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) 344 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)