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

http://mercurial.selenic.com/bts/issue842

     2

     3

  $ hg init

     4

  $ echo foo > a

     5

  $ hg ci -Ama

     6

  adding a

     7

     8

  $ hg up -r0000

     9

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

    10

    11

  $ echo bar > a

    12

    13

Should issue new head warning:

    14

    15

  $ hg ci -Amb

    16

  adding a

    17

  created new head

    18

    19

  $ hg up -r0000

    20

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

    21

    22

  $ echo stuffy > a

    23

    24

Should not issue new head warning:

    25

    26

  $ hg ci -q -Amc

    27

    28

  $ hg up -r0000

    29

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

    30

    31

  $ echo crap > a

    32

  $ hg branch testing

    33

  marked working directory as branch testing

    34

  (branches are permanent and global, did you want a bookmark?)

    35

    36

Should not issue warning:

    37

    38

  $ hg ci -q -Amd

    39