Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-update-reverse.out @ 1948:ebe273a16048
merge with crew/templates
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Mon, 13 Mar 2006 23:38:14 +0100 |
parents | 7544700fd931 |
children | b2ae81a7df29 |
line wrap: on
line diff
--- a/tests/test-update-reverse.out +++ b/tests/test-update-reverse.out @@ -1,37 +1,37 @@ Main should be gone a -changeset: 3:91ebc10ed028 +changeset: 3:ded32b0db104 tag: tip user: test -date: Thu Jan 1 00:00:00 1970 +0000 +date: Mon Jan 12 13:46:40 1970 +0000 summary: Added side2 -changeset: 2:b932d7dbb1e1 -parent: 0:c2eda428b523 +changeset: 2:92a816cea698 +parent: 0:537353581d3d user: test -date: Thu Jan 1 00:00:00 1970 +0000 +date: Mon Jan 12 13:46:40 1970 +0000 summary: Added side1 -changeset: 1:71a760306caf +changeset: 1:221226fb2bd8 user: test -date: Thu Jan 1 00:00:00 1970 +0000 +date: Mon Jan 12 13:46:40 1970 +0000 summary: Added main -changeset: 0:c2eda428b523 +changeset: 0:537353581d3d user: test -date: Thu Jan 1 00:00:00 1970 +0000 +date: Mon Jan 12 13:46:40 1970 +0000 summary: Added a Should have two heads, side2 and main -changeset: 3:91ebc10ed028 +changeset: 3:ded32b0db104 tag: tip user: test -date: Thu Jan 1 00:00:00 1970 +0000 +date: Mon Jan 12 13:46:40 1970 +0000 summary: Added side2 -changeset: 1:71a760306caf +changeset: 1:221226fb2bd8 user: test -date: Thu Jan 1 00:00:00 1970 +0000 +date: Mon Jan 12 13:46:40 1970 +0000 summary: Added main Should show a side1 side2 @@ -47,6 +47,7 @@ remote created main getting main removing side1 removing side2 +1 files updated, 0 files merged, 2 files removed, 0 files unresolved Should only show a main a main