rebase: respect checkunknown and checkignored in more cases checkunknown and checkignored are currently respected for updates and regular merges, but not for certain kinds of rebases. To be precise, they aren't respected for rebases when: (1) we're rebasing while currently on the destination commit, and (2) an untracked or ignored file F is currently in the working copy, and (3) the same file F is in a source commit, and (4) F has different contents in the source commit. This happens because rebases set force to True when calling merge.update. Setting force to True makes a lot of sense in general, but it turns out the force option is overloaded: there's a deprecated '--force' option in merge that allows you to merge in outstanding changes, including changes in untracked files. We use the 'mergeforce' parameter to tell those two cases apart. I think the behavior during rebases when checkunknown is 'abort' (the default) is wrong -- we should abort on or overwrite differing untracked files, not try to merge them in. However that currently breaks rebases by aborting in the middle -- we need better handling for that case before we can change the default.

     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