tests/test-evolve-obshistory.t
branchstable
changeset 3363 380fa6e8baf2
parent 3223 73b4e84df0bd
child 3375 1cb549cd6236
equal deleted inserted replaced
3362:92b414710d2e 3363:380fa6e8baf2
   970   $ hg update --hidden 'desc(A0)'
   970   $ hg update --hidden 'desc(A0)'
   971   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   971   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   972   working directory parent is obsolete! (471f378eab4c)
   972   working directory parent is obsolete! (471f378eab4c)
   973   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   973   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   974   $ hg update 0dec01379d3b
   974   $ hg update 0dec01379d3b
   975   working directory parent is obsolete! (471f378eab4c)
       
   976   (use 'hg evolve' to update to its successor: eb5a0daa2192)
       
   977   abort: hidden revision '0dec01379d3b'!
   975   abort: hidden revision '0dec01379d3b'!
   978   (use --hidden to access hidden revisions; successor: eb5a0daa2192)
   976   (use --hidden to access hidden revisions; successor: eb5a0daa2192)
   979   [255]
   977   [255]
   980   $ hg update --hidden 'desc(B0)'
   978   $ hg update --hidden 'desc(B0)'
   981   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   979   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1522   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1520   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1523   working directory parent is obsolete! (0dec01379d3b)
  1521   working directory parent is obsolete! (0dec01379d3b)
  1524   (use 'hg evolve' to update to its successor: eb5a0daa2192)
  1522   (use 'hg evolve' to update to its successor: eb5a0daa2192)
  1525   $ hg update 0dec01379d3b
  1523   $ hg update 0dec01379d3b
  1526   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1524   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1527   working directory parent is obsolete! (0dec01379d3b)
       
  1528   (use 'hg evolve' to update to its successor: eb5a0daa2192)
       
  1529   $ hg update --hidden 'desc(B0)'
  1525   $ hg update --hidden 'desc(B0)'
  1530   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1526   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1531   working directory parent is obsolete! (0dec01379d3b)
       
  1532   (use 'hg evolve' to update to its successor: eb5a0daa2192)
       
  1533 
  1527 
  1534 Test output with pushed and pulled obs markers
  1528 Test output with pushed and pulled obs markers
  1535 ==============================================
  1529 ==============================================
  1536 
  1530 
  1537 Test setup
  1531 Test setup