Mercurial > hg > mercurial-crew-with-dirclash
comparison 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 |
comparison
equal
deleted
inserted
replaced
1946:9fee186f7f0d | 1948:ebe273a16048 |
---|---|
1 Main should be gone | 1 Main should be gone |
2 a | 2 a |
3 changeset: 3:91ebc10ed028 | 3 changeset: 3:ded32b0db104 |
4 tag: tip | 4 tag: tip |
5 user: test | 5 user: test |
6 date: Thu Jan 1 00:00:00 1970 +0000 | 6 date: Mon Jan 12 13:46:40 1970 +0000 |
7 summary: Added side2 | 7 summary: Added side2 |
8 | 8 |
9 changeset: 2:b932d7dbb1e1 | 9 changeset: 2:92a816cea698 |
10 parent: 0:c2eda428b523 | 10 parent: 0:537353581d3d |
11 user: test | 11 user: test |
12 date: Thu Jan 1 00:00:00 1970 +0000 | 12 date: Mon Jan 12 13:46:40 1970 +0000 |
13 summary: Added side1 | 13 summary: Added side1 |
14 | 14 |
15 changeset: 1:71a760306caf | 15 changeset: 1:221226fb2bd8 |
16 user: test | 16 user: test |
17 date: Thu Jan 1 00:00:00 1970 +0000 | 17 date: Mon Jan 12 13:46:40 1970 +0000 |
18 summary: Added main | 18 summary: Added main |
19 | 19 |
20 changeset: 0:c2eda428b523 | 20 changeset: 0:537353581d3d |
21 user: test | 21 user: test |
22 date: Thu Jan 1 00:00:00 1970 +0000 | 22 date: Mon Jan 12 13:46:40 1970 +0000 |
23 summary: Added a | 23 summary: Added a |
24 | 24 |
25 Should have two heads, side2 and main | 25 Should have two heads, side2 and main |
26 changeset: 3:91ebc10ed028 | 26 changeset: 3:ded32b0db104 |
27 tag: tip | 27 tag: tip |
28 user: test | 28 user: test |
29 date: Thu Jan 1 00:00:00 1970 +0000 | 29 date: Mon Jan 12 13:46:40 1970 +0000 |
30 summary: Added side2 | 30 summary: Added side2 |
31 | 31 |
32 changeset: 1:71a760306caf | 32 changeset: 1:221226fb2bd8 |
33 user: test | 33 user: test |
34 date: Thu Jan 1 00:00:00 1970 +0000 | 34 date: Mon Jan 12 13:46:40 1970 +0000 |
35 summary: Added main | 35 summary: Added main |
36 | 36 |
37 Should show a side1 side2 | 37 Should show a side1 side2 |
38 a | 38 a |
39 side1 | 39 side1 |
45 remote deleted side1, clobbering | 45 remote deleted side1, clobbering |
46 remote created main | 46 remote created main |
47 getting main | 47 getting main |
48 removing side1 | 48 removing side1 |
49 removing side2 | 49 removing side2 |
50 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
50 Should only show a main | 51 Should only show a main |
51 a | 52 a |
52 main | 53 main |