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

     2 Main should be gone

     3 a

     4 created new head

     5 changeset:   3:91ebc10ed028

     6 tag:         tip

     7 user:        test

     8 date:        Thu Jan 01 00:00:00 1970 +0000

     9 summary:     Added side2

    10 

    11 changeset:   2:b932d7dbb1e1

    12 parent:      0:c2eda428b523

    13 user:        test

    14 date:        Thu Jan 01 00:00:00 1970 +0000

    15 summary:     Added side1

    16 

    17 changeset:   1:71a760306caf

    18 user:        test

    19 date:        Thu Jan 01 00:00:00 1970 +0000

    20 summary:     Added main

    21 

    22 changeset:   0:c2eda428b523

    23 user:        test

    24 date:        Thu Jan 01 00:00:00 1970 +0000

    25 summary:     Added a

    26 

    27 Should have two heads, side2 and main

    28 changeset:   3:91ebc10ed028

    29 tag:         tip

    30 user:        test

    31 date:        Thu Jan 01 00:00:00 1970 +0000

    32 summary:     Added side2

    33 

    34 changeset:   1:71a760306caf

    35 user:        test

    36 date:        Thu Jan 01 00:00:00 1970 +0000

    37 summary:     Added main

    38 

    39 Should show a side1 side2

    40 a

    41 side1

    42 side2

    43 resolving manifests

    44  overwrite True partial False

    45  ancestor 91ebc10ed028+ local 91ebc10ed028+ remote 71a760306caf

    46  side2: other deleted -> r

    47  side1: other deleted -> r

    48  main: remote created -> g

    49 updating: side1 1/3 files (33.33%)

    50 removing side1

    51 updating: side2 2/3 files (66.67%)

    52 removing side2

    53 updating: main 3/3 files (100.00%)

    54 getting main

    55 1 files updated, 0 files merged, 2 files removed, 0 files unresolved

    56 Should only show a main

    57 a

    58 main