Differences between revisions 2 and 3
⇤ ← Revision 2 as of 2011-11-16 13:52:08 →
Size: 683
Editor: JulianFoad
Comment:
← Revision 3 as of 2011-11-16 13:59:52 → ⇥
Size: 709
Editor: JulianFoad
Comment:
Deletions are marked like this. Additions are marked like this.
Line 20: Line 20:
  (single ancestry line) 

merge_reintegrate[_locked]
    |
    |
    +------------------>  )
                          )  merge_cousins_and_supplement_mergeinfo
    +------------------>  )      |   (2-URL, with common ancestor & MI)
    |     2-URL                  |
    |                            |
merge[_locked]                   |
    |                            +----------->  )
    |     ...                                   )
    +---------------------------------------->  )  do_merge
                                                )    (either a single ancestry line,
    +---------------------------------------->  )     or no MI)
    |
    |
merge_peg[_locked]
  (single ancestry line)

CallGraphOfMergeCode (last edited 2011-11-16 13:59:52 by JulianFoad)