$ cat >> $HGRCPATH <<EOF

  > [defaults]

  > amend=-d "0 0"

  > fold=-d "0 0"

  > [web]

  > push_ssl = false

  > allow_push = *

  > [phases]

  > publish = False

  > [alias]

  > qlog = log --template='{rev} - {node|short} {desc} ({phase})\n'

  > [diff]

  > git = 1

  > unified = 0

  > [extensions]

  > hgext.graphlog=

  > EOF

  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH

  $ mkcommit() {

  >    echo "$1" > "$1"

  >    hg add "$1"

  >    hg ci -m "add $1"

  > }

  $ mkstack() {

  >    # Creates a stack of commit based on $1 with messages from $2, $3 ..

  >    hg update $1 -C

  >    shift

  >    mkcommits $*

  > }

  $ glog() {

  >   hg glog --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@"

  > }

  $ shaof() {

  >   hg log -T {node} -r "first(desc($1))"

  > }

  $ mkcommits() {

  >   for i in $@; do mkcommit $i ; done

  > }

Test the evolution test topic is installed

  $ hg help evolution

  Safely Rewriting History

  """"""""""""""""""""""""

      Obsolescence markers make it possible to mark changesets that have been

      deleted or superset in a new version of the changeset.

      Unlike the previous way of handling such changes, by stripping the old

      changesets from the repository, obsolescence markers can be propagated

      between repositories. This allows for a safe and simple way of exchanging

      mutable history and altering it after the fact. Changeset phases are

      respected, such that only draft and secret changesets can be altered (see

      "hg hg phases" for details).

      Obsolescence is tracked using "obsolete markers", a piece of metadata

      tracking which changesets have been made obsolete, potential successors

      for a given changeset, the moment the changeset was marked as obsolete,

      and the user who performed the rewriting operation. The markers are stored

      separately from standard changeset data can be exchanged without any of

      the precursor changesets, preventing unnecessary exchange of obsolescence

      data.

      The complete set of obsolescence markers describes a history of changeset

      modifications that is orthogonal to the repository history of file

      modifications. This changeset history allows for detection and automatic

      resolution of edge cases arising from multiple users rewriting the same

      part of history concurrently.

      Current feature status

      ======================

      This feature is still in development.  If you see this help, you have

      enable an extension that turned this feature on.

      Obsolescence markers will be exchanged between repositories that

      explicitly assert support for the obsolescence feature (this can currently

      only be done via an extension).

various init

  $ hg init local

  $ cd local

  $ mkcommit a

  $ mkcommit b

  $ cat >> .hg/hgrc << EOF

  > [phases]

  > publish = True

  > EOF

  $ hg pull -q . # make 1 public

  $ rm .hg/hgrc

  $ mkcommit c

  $ mkcommit d

  $ hg up 1

  0 files updated, 0 files merged, 2 files removed, 0 files unresolved

  $ mkcommit e -q

  created new head

  $ mkcommit f

  $ hg qlog

  5 - e44648563c73 add f (draft)

  4 - fbb94e3a0ecf add e (draft)

  3 - 47d2a3944de8 add d (draft)

  2 - 4538525df7e2 add c (draft)

  1 - 7c3bad9141dc add b (public)

  0 - 1f0dee641bb7 add a (public)

test kill and immutable changeset

  $ hg log -r 1 --template '{rev} {phase} {obsolete}\n'

  1 public stable

  $ hg kill 1

  abort: cannot prune immutable changeset: 7c3bad9141dc

  (see "hg help phases" for details)

  [255]

  $ hg log -r 1 --template '{rev} {phase} {obsolete}\n'

  1 public stable

test simple kill

  $ hg id -n

  5

  $ hg kill .

  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

  working directory now at fbb94e3a0ecf

  1 changesets pruned

  $ hg qlog

  4 - fbb94e3a0ecf add e (draft)

  3 - 47d2a3944de8 add d (draft)

  2 - 4538525df7e2 add c (draft)

  1 - 7c3bad9141dc add b (public)

  0 - 1f0dee641bb7 add a (public)

test multiple kill

  $ hg kill 4 -r 3

  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

  working directory now at 7c3bad9141dc

  2 changesets pruned

  $ hg qlog

  2 - 4538525df7e2 add c (draft)

  1 - 7c3bad9141dc add b (public)

  0 - 1f0dee641bb7 add a (public)

test kill with dirty changes

  $ hg up 2

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ echo 4 > g

  $ hg add g

  $ hg kill .

  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

  working directory now at 7c3bad9141dc

  1 changesets pruned

  $ hg st

  A g

Smoketest debugobsrelsethashtree:

  $ hg debugobsrelsethashtree

  1f0dee641bb7258c56bd60e93edfa2405381c41e 0000000000000000000000000000000000000000

  7c3bad9141dcb46ff89abf5f61856facd56e476c * (glob)

  4538525df7e2b9f09423636c61ef63a4cb872a2d * (glob)

  47d2a3944de8b013de3be9578e8e344ea2e6c097 * (glob)

  fbb94e3a0ecf6d20c2cc31152ef162ce45af982f * (glob)

  e44648563c73f75950076031c6fdf06629de95f1 * (glob)

  $ cd ..

##########################

importing Parren test

##########################

  $ cat << EOF >> $HGRCPATH

  > [ui]

  > logtemplate = "{rev}\t{bookmarks}: {desc|firstline} - {author|user}\n"

  > EOF

Creating And Updating Changeset

===============================

Setup the Base Repo

-------------------

We start with a plain base repo::

  $ hg init main; cd main

  $ cat >main-file-1 <<-EOF

  > One

  > 

  > Two

  > 

  > Three

  > EOF

  $ echo Two >main-file-2

  $ hg add

  adding main-file-1

  adding main-file-2

  $ hg commit --message base

  $ cd ..

and clone this into a new repo where we do our work::

  $ hg clone main work

  updating to branch default

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ cd work

Create First Patch

------------------

To begin with, we just do the changes that will be the initial version of the changeset::

  $ echo One >file-from-A

  $ sed -i'' -e s/One/Eins/ main-file-1

  $ hg add file-from-A

So this is what we would like our changeset to be::

  $ hg diff

  diff --git a/file-from-A b/file-from-A

  new file mode 100644

  --- /dev/null

  +++ b/file-from-A

  @@ -0,0 +1,1 @@

  +One

  diff --git a/main-file-1 b/main-file-1

  --- a/main-file-1

  +++ b/main-file-1

  @@ -1,1 +1,1 @@

  -One

  +Eins

To commit it we just - commit it::

  $ hg commit --message "a nifty feature"

and place a bookmark so we can easily refer to it again (which we could have done before the commit)::

  $ hg book feature-A

Create Second Patch

-------------------

Let's do this again for the second changeset::

  $ echo Two >file-from-B

  $ sed -i'' -e s/Two/Zwie/ main-file-1

  $ hg add file-from-B

Before committing, however, we need to switch to a new bookmark for the second

changeset. Otherwise we would inadvertently move the bookmark for our first changeset.

It is therefore advisable to always set the bookmark before committing::

  $ hg book feature-B

  $ hg commit --message "another feature (child of $(hg log -r . -T '{node|short}'))"

So here we are::

  $ hg book

     feature-A                 1:568a468b60fc

   * feature-B                 2:73296a82292a

Fix The Second Patch

--------------------

There's a typo in feature-B. We spelled *Zwie* instead of *Zwei*::

  $ hg diff --change tip | grep -F Zwie

  +Zwie

Fixing this is very easy. Just change::

  $ sed -i'' -e s/Zwie/Zwei/ main-file-1

and **amend**::

  $ hg amend

This results in a new single changeset for our amended changeset, and the old

changeset plus the updating changeset are hidden from view by default::

  $ hg log

  4	feature-B: another feature (child of 568a468b60fc) - test

  1	feature-A: a nifty feature - test

  0	: base - test

  $ hg up feature-A -q

  $ hg bookmark -i feature-A

  $ sed -i'' -e s/Eins/Un/ main-file-1

(amend of public changeset denied)

  $ hg phase --public 0 -v

  phase changed for 1 changesets

(amend of on ancestors)

  $ hg amend

  1 new unstable changesets

  $ hg log

  6	feature-A: a nifty feature - test

  4	feature-B: another feature (child of 568a468b60fc) - test

  1	: a nifty feature - test

  0	: base - test

  $ hg up -q 0

  $ glog --hidden

  o  6:ba0ec09b1bab@default(draft) a nifty feature

  |

  | x  5:c296b79833d1@default(draft) temporary amend commit for 568a468b60fc

  | |

  | | o  4:6992c59c6b06@default(draft) another feature (child of 568a468b60fc)

  | |/

  | | x  3:c97947cdc7a2@default(draft) temporary amend commit for 73296a82292a

  | | |

  | | x  2:73296a82292a@default(draft) another feature (child of 568a468b60fc)

  | |/

  | x  1:568a468b60fc@default(draft) a nifty feature

  |/

  @  0:e55e0562ee93@default(public) base

  $ hg debugobsolete

  73296a82292a76fb8a7061969d2489ec0d84cd5e 6992c59c6b06a1b4a92e24ff884829ae026d018b 0 (*) {'user': 'test'} (glob)

  c97947cdc7a2a11cf78419f5c2c3dd3944ec79e8 0 {73296a82292a76fb8a7061969d2489ec0d84cd5e} (*) {'user': 'test'} (glob)

  568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (*) {'user': 'test'} (glob)

  c296b79833d1d497f33144786174bf35e04e44a3 0 {568a468b60fc99a42d5d4ddbe181caff1eef308d} (*) {'user': 'test'} (glob)

  $ hg evolve

  move:[4] another feature (child of 568a468b60fc)

  atop:[6] a nifty feature

  merging main-file-1

  working directory is now at 99833d22b0c6

  $ hg log

  7	feature-B: another feature (child of ba0ec09b1bab) - test

  6	feature-A: a nifty feature - test

  0	: base - test

Test commit -o options

  $ hg up 6

  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ hg revert -r 7 --all

  adding file-from-B

  reverting main-file-1

  $ sed -i'' -e s/Zwei/deux/ main-file-1

  $ hg commit -m 'another feature that rox' -o 7

  created new head

  $ hg log

  8	feature-B: another feature that rox - test

  6	feature-A: a nifty feature - test

  0	: base - test

phase change turning obsolete changeset public issue a bumped warning

  $ hg phase --hidden --public 7

  1 new bumped changesets

all solving bumped troubled

  $ hg glog

  @  8	feature-B: another feature that rox - test

  |