topics: make sure we commit on new parents while changing topics (issue5441) While changing topics of a set of linear commits, we used to commit our new changesets with new topic on parents of its predecessor i.e. changeset before the topic change. If the topic of parent was also changed, that parent will become obsolete and hence resulting the cnew commit in unstable state. For a set of linear commits this repeats and we end up in a tree state as mentioned in the bug. This patch fixes the bug by checking whether the parent was obsoleted and if yes, commit on the new parent.

     1

  $ cat >> $HGRCPATH <<EOF

     2

  > [ui]

     3

  > logtemplate={rev}:{node|short}[{bookmarks}] ({obsolete}/{phase}) {desc|firstline}\n

     4

  > [extensions]

     5

  > EOF

     6

  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH

     7

     8

  $ mkcommit() {

     9

  >    echo "$1" > "$1"

    10

  >    hg add "$1"

    11

  >    hg ci -m "add $1"

    12

  > }

    13

    14

  $ hg init repo

    15

  $ cd repo

    16

  $ mkcommit a

    17

  $ mkcommit b

    18

    19

test disabling commands

    20

    21

  $ cat >> .hg/hgrc <<EOF

    22

  > [experimental]

    23

  > evolution=createmarkers

    24

  >   allowunstable

    25

  >   exchange

    26

  > EOF

    27

  $ hg prune | head -n 2

    28

  hg: unknown command 'prune'

    29

  Mercurial Distributed SCM

    30