diff -r c4c2ba553401 -r 28e2e3804f2e tests/test-update-reverse.out --- a/tests/test-update-reverse.out Mon Sep 13 16:25:13 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -0 files updated, 0 files merged, 1 files removed, 0 files unresolved -Main should be gone -a -created new head -changeset: 3:91ebc10ed028 -tag: tip -user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: Added side2 - -changeset: 2:b932d7dbb1e1 -parent: 0:c2eda428b523 -user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: Added side1 - -changeset: 1:71a760306caf -user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: Added main - -changeset: 0:c2eda428b523 -user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: Added a - -Should have two heads, side2 and main -changeset: 3:91ebc10ed028 -tag: tip -user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: Added side2 - -changeset: 1:71a760306caf -user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: Added main - -Should show a side1 side2 -a -side1 -side2 -resolving manifests - overwrite True partial False - ancestor 91ebc10ed028+ local 91ebc10ed028+ remote 71a760306caf - side2: other deleted -> r - side1: other deleted -> r - main: remote created -> g -updating: side1 1/3 files (33.33%) -removing side1 -updating: side2 2/3 files (66.67%) -removing side2 -updating: main 3/3 files (100.00%) -getting main -1 files updated, 0 files merged, 2 files removed, 0 files unresolved -Should only show a main -a -main