tests/test-evolve-obshistory.t
changeset 2553 85cabd631a1b
parent 2546 abe6dfbdc744
child 2585 b5e3fe610beb
equal deleted inserted replaced
2552:006400e25e22 2553:85cabd631a1b
  1033   (use --hidden to access hidden revisions; diverged)
  1033   (use --hidden to access hidden revisions; diverged)
  1034   [255]
  1034   [255]
  1035   $ hg update --hidden 'desc(A0)'
  1035   $ hg update --hidden 'desc(A0)'
  1036   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1036   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1037   working directory parent is obsolete! (471f378eab4c)
  1037   working directory parent is obsolete! (471f378eab4c)
  1038   (471f378eab4c has diverged, use 'hg evolve -list --divergent' to resolve the issue)
  1038   (471f378eab4c has diverged, use 'hg evolve --list --divergent' to resolve the issue)
  1039 
  1039 
  1040 Test output with amended + folded commit
  1040 Test output with amended + folded commit
  1041 ========================================
  1041 ========================================
  1042 
  1042 
  1043 Test setup
  1043 Test setup