tests/test-evolve-obshistory.t
branchmercurial-4.3
changeset 3166 e1a230cc4527
parent 3116 9f900937c198
parent 3154 406992d0d611
child 3167 f089741039e5
child 3287 4303a46b4167
equal deleted inserted replaced
3127:cd90da787a44 3166:e1a230cc4527
  1291   (use --hidden to access hidden revisions; diverged)
  1291   (use --hidden to access hidden revisions; diverged)
  1292   [255]
  1292   [255]
  1293   $ hg update --hidden 'desc(A0)'
  1293   $ hg update --hidden 'desc(A0)'
  1294   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1294   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1295   working directory parent is obsolete! (471f378eab4c)
  1295   working directory parent is obsolete! (471f378eab4c)
  1296   (471f378eab4c has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue)
  1296   (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
  1297 
  1297 
  1298 Test output with amended + folded commit
  1298 Test output with amended + folded commit
  1299 ========================================
  1299 ========================================
  1300 
  1300 
  1301 Test setup
  1301 Test setup