tests/test-evolve.t
changeset 1685 4fd0db2f6d84
parent 1673 8e879d59b20e
child 1686 474db2d60202
equal deleted inserted replaced
1684:40d7b0c4abb1 1685:4fd0db2f6d84
     1   $ cat >> $HGRCPATH <<EOF
     1   $ cat >> $HGRCPATH <<EOF
     2   > [defaults]
     2   > [defaults]
     3   > amend=-d "0 0"
     3   > amend=-d "0 0"
     4   > fold=-d "0 0"
     4   > fold=-d "0 0"
       
     5   > metaedit=-d "0 0"
     5   > [web]
     6   > [web]
     6   > push_ssl = false
     7   > push_ssl = false
     7   > allow_push = *
     8   > allow_push = *
     8   > [phases]
     9   > [phases]
     9   > publish = False
    10   > publish = False
  1455   |
  1456   |
  1456   ~
  1457   ~
  1457 
  1458 
  1458   $ hg status newlyadded
  1459   $ hg status newlyadded
  1459   A newlyadded
  1460   A newlyadded
       
  1461 
       
  1462 hg metaedit
       
  1463 -----------
       
  1464 
       
  1465   $ hg update --clean .
       
  1466   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
  1467   $ rm newlyadded
       
  1468   $ hg metaedit -r 0
       
  1469   abort: cannot edit commit information for public revisions
       
  1470   [255]
       
  1471 check that metaedit respects allowunstable
       
  1472   $ hg metaedit '.^' --config 'experimental.evolution=createmarkers, allnewcommands'
       
  1473   abort: cannot edit commit information in the middle of a stack
       
  1474   (c904da5245b0 will be affected)
       
  1475   [255]
       
  1476   $ hg metaedit --user foobar
       
  1477   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
  1478   $ hg log --template '{rev}: {author}\n' -r '42:' --hidden
       
  1479   42: test
       
  1480   43: foobar
       
  1481   $ hg log --template '{rev}: {author}\n' -r .
       
  1482   43: foobar
       
  1483 
       
  1484 TODO: support this
       
  1485   $ hg metaedit '.^::.'
       
  1486   abort: editing multiple revisions is not currently supported
       
  1487   [255]
       
  1488 
       
  1489 no new commit is created here because the date is the same
       
  1490   $ HGEDITOR=cat hg metaedit
       
  1491   will be evolved safely
       
  1492   
       
  1493   
       
  1494   HG: Enter commit message.  Lines beginning with 'HG:' are removed.
       
  1495   HG: Leave message empty to abort commit.
       
  1496   HG: --
       
  1497   HG: user: foobar
       
  1498   HG: branch 'default'
       
  1499   HG: changed a
       
  1500   nothing changed
       
  1501 
       
  1502   $ glog -r '.^::.'
       
  1503   @  43:62353add3dfb@default(draft) will be evolved safely
       
  1504   |
       
  1505   o  41:34ae045ec400@default(draft) amended
       
  1506   |
       
  1507   ~
       
  1508 
       
  1509 TODO: don't create a new commit in this case
       
  1510   $ hg metaedit --config defaults.metaedit=
       
  1511   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
  1512   $ hg log -r '.^::.' --template '{rev}: {desc|firstline}\n'
       
  1513   41: amended
       
  1514   44: will be evolved safely
       
  1515 
       
  1516   $ hg up .^
       
  1517   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
  1518   $ hg metaedit --user foobar2 44
       
  1519   $ hg log --template '{rev}: {author}\n' -r '42:' --hidden
       
  1520   42: test
       
  1521   43: foobar
       
  1522   44: foobar
       
  1523   45: foobar2
       
  1524   $ hg diff -r 44 -r 45 --hidden