Mercurial > evolve

comparison tests/test-evolve-obshistory-content-divergent.t @ 5318:88f9bbba392d mercurial-4.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.7 into mercurial-4.6
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 08 May 2020 22:50:09 +0800
parents 1752a2e7a226 e8660b28bfee
children 053f1fc12545
comparison
equal deleted inserted replaced
5317:011b53a9d03c 5318:88f9bbba392d
38 user: test 38 user: test
39 date: Thu Jan 01 00:00:00 1970 +0000 39 date: Thu Jan 01 00:00:00 1970 +0000
40 summary: ROOT 40 summary: ROOT
41 41
42 $ hg update --hidden 'desc(A0)' 42 $ hg update --hidden 'desc(A0)'
43 updating to a hidden changeset 471f378eab4c
44 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
43 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 45 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
44 updated to hidden changeset 471f378eab4c
45 (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
46 working directory parent is obsolete! (471f378eab4c) 46 working directory parent is obsolete! (471f378eab4c)
47 (use 'hg evolve' to update to its successor: fdf9bde5129a) 47 (use 'hg evolve' to update to its successor: fdf9bde5129a)
48 $ hg amend -m "A2" 48 $ hg amend -m "A2"
49 2 new content-divergent changesets 49 2 new content-divergent changesets
50 $ hg log --hidden -G 50 $ hg log --hidden -G
427 $ hg update 471f378eab4c 427 $ hg update 471f378eab4c
428 abort: hidden revision '471f378eab4c' has diverged! 428 abort: hidden revision '471f378eab4c' has diverged!
429 (use --hidden to access hidden revisions) 429 (use --hidden to access hidden revisions)
430 [255] 430 [255]
431 $ hg update --hidden 'desc(A0)' 431 $ hg update --hidden 'desc(A0)'
432 updating to a hidden changeset 471f378eab4c
433 (hidden revision '471f378eab4c' has diverged)
432 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 434 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
433 updated to hidden changeset 471f378eab4c
434 (hidden revision '471f378eab4c' has diverged)
435 working directory parent is obsolete! (471f378eab4c) 435 working directory parent is obsolete! (471f378eab4c)
436 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) 436 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)