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

     2

== Local

     3

Ready.

     4

Un and Deux

     5

Eins und Zwei

     6

One and Two

     7

Nope

     8

Eins und Zwei

     9

Hello, John Smith

    10

Ready.

    11

Uno und Due

    12

    13

== Remote

    14

Ready.

    15

REQ: foo?one=Vo&two=Efvy

    16

  -> Vo!boe!Efvy

    17

Un and Deux

    18

REQ: bar?b=Fjot&a=[xfj

    19

  -> Fjot!voe![xfj

    20

Eins und Zwei

    21

REQ: batch?cmds=foo:one=Pof,two=Uxp;bar:b=Fjot,a=[xfj

    22

  -> Pof!boe!Uxp;Fjot!voe![xfj

    23

REQ: greet?name=Kpio!Tnjui

    24

  -> Ifmmp-!Kpio!Tnjui

    25

REQ: batch?cmds=bar:b=Vop,a=Evf

    26

  -> Vop!voe!Evf

    27

One and Two

    28

Nope

    29

Eins und Zwei

    30

Hello, John Smith

    31

Ready.

    32

Uno und Due