subrepo: check phase of state in each subrepositories before committing Before this patch, phase of newly created commit is determined by "phases.new-commit" configuration regardless of phase of state in each subrepositories. For example, this may cause the "public" revision in the parent repository referring the "secret" one in subrepository. This patch checks phase of state in each subrepositories before committing in the parent, and aborts or changes phase of newly created commit if subrepositories have more restricted phase than the parent. This patch uses "follow" as default value of "phases.checksubrepos" configuration, because it can keep consistency between phases of the parent and subrepositories without breaking existing tool chains.

     1

  $ hg init

     2

  $ echo "nothing" > a

     3

  $ hg add a

     4

  $ hg commit -m ancestor

     5

  $ echo "something" > a

     6

  $ hg commit -m branch1

     7

  $ hg co 0

     8

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

     9

  $ echo "something else" > a

    10

  $ hg commit -m branch2

    11

  created new head

    12

    13

  $ hg merge 1

    14

  merging a

    15

  warning: conflicts during merge.

    16

  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')

    17

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

    18

  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

    19

  [1]

    20

    21

  $ hg id

    22

  32e80765d7fe+75234512624c+ tip

    23

    24

  $ cat a

    25

  <<<<<<< local

    26

  something else

    27

  =======

    28

  something

    29

  >>>>>>> other

    30

    31

  $ hg status

    32

  M a

    33

  ? a.orig