1 % create source repository

     2 adding a

     3 % fork source repository

     4 updating to branch default

     5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved

     6 adding b

     7 % update source repository

     8 % merge repositories

     9 pulling from ../t2

    10 searching for changes

    11 adding changesets

    12 adding manifests

    13 adding file changes

    14 added 1 changesets with 1 changes to 1 files (+1 heads)

    15 (run 'hg heads' to see heads, 'hg merge' to merge)

    16 1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    17 (branch merge, don't forget to commit)

    18 M b

    19 % rename b as c

    20 A c

    21 R b

    22 % rename back c as b

    23 M b

    24 % test issue 1476

    25 adding a

    26 adding b1

    27 adding b2

    28 0 files updated, 0 files merged, 2 files removed, 0 files unresolved

    29 adding c1

    30 adding c2

    31 created new head

    32 % merge heads

    33 2 files updated, 0 files merged, 0 files removed, 0 files unresolved

    34 (branch merge, don't forget to commit)

    35 % commit issue 1476

    36 copies:      c2 (c1)

    37 rolling back to revision 2 (undo commit)

    38 2 files updated, 0 files merged, 2 files removed, 0 files unresolved

    39 % merge heads again

    40 2 files updated, 0 files merged, 0 files removed, 0 files unresolved

    41 (branch merge, don't forget to commit)

    42 % commit issue 1476 with a rename on the other side

    43 copies:      b2 (b1)