merge: mark .hgsubstate as possibly dirty before submerge for consistency Before this patch, failure of updating subrepos may cause inconsistent ".hgsubstate". For example: 1. dirstate entry for ".hgsubstate" of the parent repo is filled with valid size/date (via "hg state" or so) 2. "hg update" is invoked at the parent repo 3. ".hgsubstate" of the parent repo is updated on the filesystem as a part of "g"(et) action in "merge.applyupdates" 4. it is assumed that size/date of ".hgsubstate" on the filesystem aren't changed from ones at (1) this is not so difficult condition, because just changing hash ids (every ids are same in length) in ".hgsubstate" doesn't change the file size of it 5. "subrepo.submerge()" is invoked to update subrepos 6. failure of updating in one of subrepos raises exception (e.g. "untracked file differs") 7. "hg update" is aborted without updating dirstate of the parent repo dirstate entry for ".hgsubstate" still holds size/date at (1) Then, ".hgsubstate" of the parent repo is treated as "CLEAN" unexpectedly, because updating ".hgsubstate" at (3) doesn't change size/date of it on the filesystem: see assumption at (4). This inconsistent ".hgsubstate" status causes unexpected behavior, for example: - "hg revert" forgets to revert ".hgsubstate" - "hg update" misunderstands that (not yet updated) subrepos diverge (then, it shows the prompt to confirm user's decision) To avoid inconsistent ".hgsubstate" status above, this patch marks ".hgsubstate" as possibly dirty before "submerge" invocation. "normallookup"-ed (= dirty) dirstate should be written out, even if processing is aborted by failure. This patch marks ".hgsubstate" as possibly dirty before "submerge", also when it is removed or merged while merging, for safety. This should prevent Mercurial from misunderstanding inconsistent ".hgsubstate" as clean. To satisfy conditions at (1) and (4) above, this patch uses "hg status --config debug.dirstate.delaywrite=2" (to fill valid size/date into dirstate) and "touch" (to fix date of the file).

     1

  $ HGENCODING=utf-8

     2

  $ export HGENCODING

     3

     4

  $ try() {

     5

  >   hg debugrevspec --debug $@

     6

  > }

     7

     8

  $ log() {

     9

  >   hg log --template '{rev}\n' -r "$1"

    10

  > }

    11

    12

  $ hg init repo

    13

  $ cd repo

    14

    15

  $ try 'p1()'

    16

  (func

    17

    ('symbol', 'p1')

    18

    None)

    19

  $ try 'p2()'

    20

  (func

    21

    ('symbol', 'p2')

    22

    None)

    23

  $ try 'parents()'

    24

  (func

    25

    ('symbol', 'parents')

    26

    None)

    27

    28

null revision

    29

  $ log 'p1()'

    30

  $ log 'p2()'

    31

  $ log 'parents()'

    32

    33

working dir with a single parent

    34

  $ echo a > a

    35

  $ hg ci -Aqm0

    36

  $ log 'p1()'

    37

  0

    38

  $ log 'tag() and p1()'

    39

  $ log 'p2()'

    40

  $ log 'parents()'

    41

  0

    42

  $ log 'tag() and parents()'

    43

    44

merge in progress

    45

  $ echo b > b

    46

  $ hg ci -Aqm1

    47

  $ hg up -q 0

    48

  $ echo c > c

    49

  $ hg ci -Aqm2

    50

  $ hg merge -q

    51

  $ log 'p1()'

    52

  2

    53

  $ log 'p2()'

    54

  1

    55

  $ log 'tag() and p2()'

    56

  $ log 'parents()'

    57

  1

    58

  2

    59

    60

  $ cd ..