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 This is file a1 > a

     3

  $ hg add a

     4

  $ hg commit -m "commit #0"

     5

  $ echo This is file b1 > b

     6

  $ hg add b

     7

  $ hg commit -m "commit #1"

     8

  $ hg update 0

     9

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

    10

  $ echo This is file c1 > c

    11

  $ hg add c

    12

  $ hg commit -m "commit #2"

    13

  created new head

    14

  $ hg merge 1

    15

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

    16

  (branch merge, don't forget to commit)

    17

  $ rm b

    18

  $ echo This is file c22 > c

    19

    20

Test hg behaves when committing with a missing file added by a merge

    21

    22

  $ hg commit -m "commit #3"

    23

  abort: cannot commit merge with missing files

    24

  [255]

    25