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/issue619

     2

     3

  $ hg init

     4

  $ echo a > a

     5

  $ hg ci -Ama

     6

  adding a

     7

     8

  $ echo b > b

     9

  $ hg branch b

    10

  marked working directory as branch b

    11

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

    12

  $ hg ci -Amb

    13

  adding b

    14

    15

  $ hg co -C 0

    16

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

    17

    18

Fast-forward:

    19

    20

  $ hg merge b

    21

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

    22

  (branch merge, don't forget to commit)

    23

  $ hg ci -Ammerge

    24

    25

Bogus fast-forward should fail:

    26

    27

  $ hg merge b

    28

  abort: merging with a working directory ancestor has no effect

    29

  [255]

    30