Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-branch.out @ 3068:547d1a4aa105
hg merge: fix lookup of branch
add some tests for branch usage
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Fri, 08 Sep 2006 02:16:16 +0200 |
parents | |
children | b28d3e0f9a8c |
comparison
equal
deleted
inserted
replaced
3067:9b480509658c | 3068:547d1a4aa105 |
---|---|
1 adding a | |
2 adding b | |
3 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 changeset: 0:b544c4ac4389 | |
5 user: test | |
6 date: Mon Jan 12 13:46:40 1970 +0000 | |
7 summary: 0 | |
8 | |
9 Using head f4ac749470f2 for branch foo | |
10 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
11 changeset: 1:f4ac749470f2 | |
12 tag: foo | |
13 tag: tip | |
14 user: test | |
15 date: Mon Jan 12 13:46:40 1970 +0000 | |
16 summary: 1 | |
17 | |
18 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
19 adding c | |
20 Using head f4ac749470f2 for branch foo | |
21 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
22 (branch merge, don't forget to commit) | |
23 changeset: 2:1505d56ee00e | |
24 tag: tip | |
25 parent: 0:b544c4ac4389 | |
26 user: test | |
27 date: Mon Jan 12 13:46:40 1970 +0000 | |
28 summary: 0.0 | |
29 | |
30 changeset: 1:f4ac749470f2 | |
31 tag: foo | |
32 branch: foo | |
33 user: test | |
34 date: Mon Jan 12 13:46:40 1970 +0000 | |
35 summary: 1 | |
36 | |
37 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
38 adding d | |
39 Using head f4ac749470f2 for branch foo | |
40 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
41 (branch merge, don't forget to commit) | |
42 changeset: 3:53b72df12ae5 | |
43 tag: tip | |
44 parent: 0:b544c4ac4389 | |
45 user: test | |
46 date: Mon Jan 12 13:46:40 1970 +0000 | |
47 summary: 0.0 | |
48 | |
49 changeset: 1:f4ac749470f2 | |
50 tag: foo | |
51 branch: foo | |
52 user: test | |
53 date: Mon Jan 12 13:46:40 1970 +0000 | |
54 summary: 1 | |
55 |