tests/test-update-reverse.out
author Martin Geisler <mg@lazybytes.net>
Thu, 02 Sep 2010 23:22:51 +0200
changeset 12156 4c94b6d0fb1c
parent 11716 db426935fa94
permissions -rw-r--r--
tests: remove unneeded -d flags Many tests fixed the commit date of their changesets at '1000000 0' or similar. However testing with "Mon Jan 12 13:46:40 1970 +0000" is not better than testing with "Thu Jan 01 00:00:00 1970 +0000", which is the default run-tests.py installs. Removing the unnecessary flag removes some clutter and will hopefully make it clearer what the tests are really trying to test. Some tests did not even change their output when the dates were changed, in which case the -d flag was truly irrelevant. Dates used in sequence (such as '0 0', '1 0', etc...) were left alone since they may make the test easier to understand.

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