tests/test-obsolete.t
changeset 2553 85cabd631a1b
parent 2546 abe6dfbdc744
child 2566 f6821f6bf73c
equal deleted inserted replaced
2552:006400e25e22 2553:85cabd631a1b
   703 Check import reports new unstable changeset:
   703 Check import reports new unstable changeset:
   704 
   704 
   705   $ hg up --hidden 2
   705   $ hg up --hidden 2
   706   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   706   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   707   working directory parent is obsolete! (4538525df7e2)
   707   working directory parent is obsolete! (4538525df7e2)
   708   (4538525df7e2 has diverged, use 'hg evolve -list --divergent' to resolve the issue)
   708   (4538525df7e2 has diverged, use 'hg evolve --list --divergent' to resolve the issue)
   709   $ hg export 9468a5f5d8b2 | hg import -
   709   $ hg export 9468a5f5d8b2 | hg import -
   710   applying patch from stdin
   710   applying patch from stdin
   711   1 new unstable changesets
   711   1 new unstable changesets
   712 
   712 
   713 
   713