tests/test-evolve-obshistory.t
branchmercurial-4.1
changeset 3289 bd99cb54712b
parent 3288 b714709afe6a
parent 3168 78eb1c1d987b
child 3420 b21a3753255f
equal deleted inserted replaced
3288:b714709afe6a 3289:bd99cb54712b
    10   > interactive = true
    10   > interactive = true
    11   > [phases]
    11   > [phases]
    12   > publish=False
    12   > publish=False
    13   > [extensions]
    13   > [extensions]
    14   > evolve =
    14   > evolve =
       
    15   > color =
    15   > [experimental]
    16   > [experimental]
    16   > evolution.effect-flags = yes
    17   > evolution.effect-flags = yes
    17   > EOF
    18   > EOF
    18 
    19 
    19 Test output on amended commit
    20 Test output on amended commit
   177           "shortdescription": "A0"
   178           "shortdescription": "A0"
   178       }
   179       }
   179   ]
   180   ]
   180   $ hg update 471f378eab4c
   181   $ hg update 471f378eab4c
   181   abort: hidden revision '471f378eab4c'!
   182   abort: hidden revision '471f378eab4c'!
   182   (use --hidden to access hidden revisions; successor: 4ae3a4151de9)
   183   (use --hidden to access hidden revisions)
   183   [255]
   184   [255]
   184   $ hg update --hidden "desc(A0)"
   185   $ hg update --hidden "desc(A0)"
   185   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   186   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   186   working directory parent is obsolete! (471f378eab4c)
   187   working directory parent is obsolete! (471f378eab4c)
   187   (use 'hg evolve' to update to its successor: 4ae3a4151de9)
   188   (use 'hg evolve' to update to its successor: 4ae3a4151de9)
   276   ]
   277   ]
   277   $ hg up 1
   278   $ hg up 1
   278   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   279   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   279   $ hg up 0dec01379d3b
   280   $ hg up 0dec01379d3b
   280   abort: hidden revision '0dec01379d3b'!
   281   abort: hidden revision '0dec01379d3b'!
   281   (use --hidden to access hidden revisions; pruned)
   282   (use --hidden to access hidden revisions)
   282   [255]
   283   [255]
   283   $ hg up --hidden -r 'desc(B0)'
   284   $ hg up --hidden -r 'desc(B0)'
   284   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   285   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   285   working directory parent is obsolete! (0dec01379d3b)
   286   working directory parent is obsolete! (0dec01379d3b)
   286   (use 'hg evolve' to update to its parent successor)
   287   (use 'hg evolve' to update to its parent successor)
   472          note: testing split
   473          note: testing split
   473          (No patch available, too many successors (2))
   474          (No patch available, too many successors (2))
   474   
   475   
   475   $ hg update 471597cad322
   476   $ hg update 471597cad322
   476   abort: hidden revision '471597cad322'!
   477   abort: hidden revision '471597cad322'!
   477   (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a)
   478   (use --hidden to access hidden revisions)
   478   [255]
   479   [255]
   479   $ hg update --hidden 'min(desc(A0))'
   480   $ hg update --hidden 'min(desc(A0))'
   480   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   481   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   481   working directory parent is obsolete! (471597cad322)
   482   working directory parent is obsolete! (471597cad322)
   482   (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
   483   (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
   748        rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
   749        rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob)
   749          (No patch available, too many successors (4))
   750          (No patch available, too many successors (4))
   750   
   751   
   751   $ hg update de7290d8b885
   752   $ hg update de7290d8b885
   752   abort: hidden revision 'de7290d8b885'!
   753   abort: hidden revision 'de7290d8b885'!
   753   (use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more)
   754   (use --hidden to access hidden revisions)
   754   [255]
   755   [255]
   755   $ hg update --hidden 'min(desc(A0))'
   756   $ hg update --hidden 'min(desc(A0))'
   756   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   757   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   757   working directory parent is obsolete! (de7290d8b885)
   758   working directory parent is obsolete! (de7290d8b885)
   758   (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more)
   759   (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more)
   963           "shortdescription": "B0"
   964           "shortdescription": "B0"
   964       }
   965       }
   965   ]
   966   ]
   966   $ hg update 471f378eab4c
   967   $ hg update 471f378eab4c
   967   abort: hidden revision '471f378eab4c'!
   968   abort: hidden revision '471f378eab4c'!
   968   (use --hidden to access hidden revisions; successor: eb5a0daa2192)
   969   (use --hidden to access hidden revisions)
   969   [255]
   970   [255]
   970   $ hg update --hidden 'desc(A0)'
   971   $ hg update --hidden 'desc(A0)'
   971   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   972   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   972   working directory parent is obsolete! (471f378eab4c)
   973   working directory parent is obsolete! (471f378eab4c)
   973   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   974   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   974   $ hg update 0dec01379d3b
   975   $ hg update 0dec01379d3b
   975   working directory parent is obsolete! (471f378eab4c)
   976   working directory parent is obsolete! (471f378eab4c)
   976   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   977   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   977   abort: hidden revision '0dec01379d3b'!
   978   abort: hidden revision '0dec01379d3b'!
   978   (use --hidden to access hidden revisions; successor: eb5a0daa2192)
   979   (use --hidden to access hidden revisions)
   979   [255]
   980   [255]
   980   $ hg update --hidden 'desc(B0)'
   981   $ hg update --hidden 'desc(B0)'
   981   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   982   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   982   working directory parent is obsolete! (0dec01379d3b)
   983   working directory parent is obsolete! (0dec01379d3b)
   983   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   984   (use 'hg evolve' to update to its successor: eb5a0daa2192)
  1285           "shortdescription": "A1"
  1286           "shortdescription": "A1"
  1286       }
  1287       }
  1287   ]
  1288   ]
  1288   $ hg update 471f378eab4c
  1289   $ hg update 471f378eab4c
  1289   abort: hidden revision '471f378eab4c'!
  1290   abort: hidden revision '471f378eab4c'!
  1290   (use --hidden to access hidden revisions; diverged)
  1291   (use --hidden to access hidden revisions)
  1291   [255]
  1292   [255]
  1292   $ hg update --hidden 'desc(A0)'
  1293   $ hg update --hidden 'desc(A0)'
  1293   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
  1294   working directory parent is obsolete! (471f378eab4c)
  1295   working directory parent is obsolete! (471f378eab4c)
  1295   (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
  1296   (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
  1503           "shortdescription": "A0"
  1504           "shortdescription": "A0"
  1504       }
  1505       }
  1505   ]
  1506   ]
  1506   $ hg update 471f378eab4c
  1507   $ hg update 471f378eab4c
  1507   abort: hidden revision '471f378eab4c'!
  1508   abort: hidden revision '471f378eab4c'!
  1508   (use --hidden to access hidden revisions; successor: eb5a0daa2192)
  1509   (use --hidden to access hidden revisions)
  1509   [255]
  1510   [255]
  1510   $ hg update --hidden 'desc(A0)'
  1511   $ hg update --hidden 'desc(A0)'
  1511   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  1512   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  1512   working directory parent is obsolete! (471f378eab4c)
  1513   working directory parent is obsolete! (471f378eab4c)
  1513   (use 'hg evolve' to update to its successor: eb5a0daa2192)
  1514   (use 'hg evolve' to update to its successor: eb5a0daa2192)