Mercurial > hg
comparison tests/test-excessive-merge.t @ 11974:ccd581c66284
tests: unify test-excessive-merge
author | Pradeepkumar Gayam <in3xes@gmail.com> |
---|---|
date | Wed, 18 Aug 2010 04:37:06 +0530 |
parents | tests/test-excessive-merge@c0b449154a90 |
children | 4c94b6d0fb1c |
comparison
equal
deleted
inserted
replaced
11973:b773ca489fd3 | 11974:ccd581c66284 |
---|---|
1 $ hg init | |
2 | |
3 $ echo foo > a | |
4 $ echo foo > b | |
5 $ hg add a b | |
6 | |
7 $ hg ci -m "test" -d "1000000 0" | |
8 | |
9 $ echo blah > a | |
10 | |
11 $ hg ci -m "branch a" -d "1000000 0" | |
12 | |
13 $ hg co 0 | |
14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
15 | |
16 $ echo blah > b | |
17 | |
18 $ hg ci -m "branch b" -d "1000000 0" | |
19 created new head | |
20 $ HGMERGE=true hg merge 1 | |
21 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
22 (branch merge, don't forget to commit) | |
23 | |
24 $ hg ci -m "merge b/a -> blah" -d "1000000 0" | |
25 | |
26 $ hg co 1 | |
27 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
28 $ HGMERGE=true hg merge 2 | |
29 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
30 (branch merge, don't forget to commit) | |
31 $ hg ci -m "merge a/b -> blah" -d "1000000 0" | |
32 created new head | |
33 | |
34 $ hg log | |
35 changeset: 4:f6c172c6198c | |
36 tag: tip | |
37 parent: 1:448a8c5e42f1 | |
38 parent: 2:7c5dc2e857f2 | |
39 user: test | |
40 date: Mon Jan 12 13:46:40 1970 +0000 | |
41 summary: merge a/b -> blah | |
42 | |
43 changeset: 3:13d875a22764 | |
44 parent: 2:7c5dc2e857f2 | |
45 parent: 1:448a8c5e42f1 | |
46 user: test | |
47 date: Mon Jan 12 13:46:40 1970 +0000 | |
48 summary: merge b/a -> blah | |
49 | |
50 changeset: 2:7c5dc2e857f2 | |
51 parent: 0:dc1751ec2e9d | |
52 user: test | |
53 date: Mon Jan 12 13:46:40 1970 +0000 | |
54 summary: branch b | |
55 | |
56 changeset: 1:448a8c5e42f1 | |
57 user: test | |
58 date: Mon Jan 12 13:46:40 1970 +0000 | |
59 summary: branch a | |
60 | |
61 changeset: 0:dc1751ec2e9d | |
62 user: test | |
63 date: Mon Jan 12 13:46:40 1970 +0000 | |
64 summary: test | |
65 | |
66 $ hg debugindex .hg/store/00changelog.i | |
67 rev offset length base linkrev nodeid p1 p2 | |
68 0 0 64 0 0 dc1751ec2e9d 000000000000 000000000000 | |
69 1 64 68 1 1 448a8c5e42f1 dc1751ec2e9d 000000000000 | |
70 2 132 68 2 2 7c5dc2e857f2 dc1751ec2e9d 000000000000 | |
71 3 200 75 3 3 13d875a22764 7c5dc2e857f2 448a8c5e42f1 | |
72 4 275 29 3 4 f6c172c6198c 448a8c5e42f1 7c5dc2e857f2 | |
73 | |
74 revision 1 | |
75 $ hg manifest --debug 1 | |
76 79d7492df40aa0fa093ec4209be78043c181f094 644 a | |
77 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 b | |
78 revision 2 | |
79 $ hg manifest --debug 2 | |
80 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 a | |
81 79d7492df40aa0fa093ec4209be78043c181f094 644 b | |
82 revision 3 | |
83 $ hg manifest --debug 3 | |
84 79d7492df40aa0fa093ec4209be78043c181f094 644 a | |
85 79d7492df40aa0fa093ec4209be78043c181f094 644 b | |
86 revision 4 | |
87 $ hg manifest --debug 4 | |
88 79d7492df40aa0fa093ec4209be78043c181f094 644 a | |
89 79d7492df40aa0fa093ec4209be78043c181f094 644 b | |
90 | |
91 $ hg debugindex .hg/store/data/a.i | |
92 rev offset length base linkrev nodeid p1 p2 | |
93 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 | |
94 1 5 6 1 1 79d7492df40a 2ed2a3912a0b 000000000000 | |
95 | |
96 $ hg verify | |
97 checking changesets | |
98 checking manifests | |
99 crosschecking files in changesets and manifests | |
100 checking files | |
101 2 files, 5 changesets, 4 total revisions |