comparison tests/test-tutorial.t @ 492:7ecd41520dae

rename `stabilize` to `evolve`

stabilize keep being valide but as Matt still like "Changeset Evolution" as a
name evolve make more sense.

Stabilize is a bit too tight to unstable too.

491:6989d8fe4ed2

  $ hg push other
  pushing to $TESTTMP/other
  searching for changes
  abort: push includes an unstable changeset: 9ac5d0e790a2!
  (use 'hg stabilize' to get a stable history or --force to ignore warnings)
  [255]
 



To resolve this unstable state, you need to rebase 9ac5d0e790a2 onto
ffa278c50818 the "hg stabilize" command will make this for you.

It has a --dry-run option to only suggest the next move.

  $ hg stabilize --dry-run
  move:[15] animals
  atop:[14] bathroom stuff
  hg rebase -Dr 9ac5d0e790a2 -d ffa278c50818

Let's do it

  

  $ hg log -r 'unstable()'
  ae45c0c3092a (draft): SPAM SPAM SPAM

  $ hg stabilize --any
  move:[17] SPAM SPAM SPAM
  atop:[14] bathroom stuff
  merging shopping

  $ hg log -G

492:7ecd41520dae

  $ hg push other
  pushing to $TESTTMP/other
  searching for changes
  abort: push includes an unstable changeset: 9ac5d0e790a2!
  (use 'hg evolve' to get a stable history or --force to ignore warnings)
  [255]
 



To resolve this unstable state, you need to rebase 9ac5d0e790a2 onto
ffa278c50818 the "hg evolve" command will make this for you.

It has a --dry-run option to only suggest the next move.

  $ hg evolve --dry-run
  move:[15] animals
  atop:[14] bathroom stuff
  hg rebase -Dr 9ac5d0e790a2 -d ffa278c50818

Let's do it

  

  $ hg log -r 'unstable()'
  ae45c0c3092a (draft): SPAM SPAM SPAM

  $ hg evolve --any
  move:[17] SPAM SPAM SPAM
  atop:[14] bathroom stuff
  merging shopping

  $ hg log -G