merge: use separate lists for each action type This replaces the grand unified action list that had multiple action types as tuples in one big list. That list was iterated multiple times just to find actions of a specific type. This data model also made some code more convoluted than necessary. Instead we now store actions as a tuple of lists. Using multiple lists gives a bit of cut'n'pasted code but also enables other optimizations. This patch uses 'if True:' to preserve indentations and help reviewing. It also limits the number of conflicts with other pending patches. It can trivially be cleaned up later.

     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