1 Warning: -t and --text is deprecated, please use -m or --message instead.

     2 Main should be gone

     3 a

     4 changeset:   3:91ebc10ed028

     5 tag:         tip

     6 user:        test

     7 date:        Thu Jan  1 00:00:00 1970 +0000

     8 summary:     Added side2

     9 

    10 changeset:   2:b932d7dbb1e1

    11 parent:      0:c2eda428b523

    12 user:        test

    13 date:        Thu Jan  1 00:00:00 1970 +0000

    14 summary:     Added side1

    15 

    16 changeset:   1:71a760306caf

    17 user:        test

    18 date:        Thu Jan  1 00:00:00 1970 +0000

    19 summary:     Added main

    20 

    21 changeset:   0:c2eda428b523

    22 user:        test

    23 date:        Thu Jan  1 00:00:00 1970 +0000

    24 summary:     Added a

    25 

    26 Should have two heads, side2 and main

    27 changeset:   3:91ebc10ed028

    28 tag:         tip

    29 user:        test

    30 date:        Thu Jan  1 00:00:00 1970 +0000

    31 summary:     Added side2

    32 

    33 changeset:   1:71a760306caf

    34 user:        test

    35 date:        Thu Jan  1 00:00:00 1970 +0000

    36 summary:     Added main

    37 

    38 Should show a side1 side2

    39 a

    40 side1

    41 side2

    42 resolving manifests

    43  force 1 allow None moddirstate True linear False

    44  ancestor 8515d4bfda76 local 1c0f48f8ece6 remote 0594b9004bae

    45 remote deleted side2, clobbering

    46 remote deleted side1, clobbering

    47 remote created main

    48 getting main

    49 removing side1

    50 removing side2

    51 Should only show a main

    52 a

    53 main