Mercurial > hg
comparison tests/test-flags.t @ 11792:47d2b4a5bd1e
tests: unify test-flags
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Thu, 12 Aug 2010 19:10:57 +0900 |
parents | tests/test-flags@5b7da468531b |
children | 4c94b6d0fb1c |
comparison
equal
deleted
inserted
replaced
11791:00cde9bddbe4 | 11792:47d2b4a5bd1e |
---|---|
1 $ umask 027 | |
2 $ mkdir test1 | |
3 $ cd test1 | |
4 | |
5 $ hg init | |
6 $ touch a b | |
7 $ hg add a b | |
8 $ hg ci -m "added a b" -d "1000000 0" | |
9 | |
10 $ cd .. | |
11 $ hg clone test1 test3 | |
12 updating to branch default | |
13 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
14 $ mkdir test2 | |
15 $ cd test2 | |
16 | |
17 $ hg init | |
18 $ hg pull ../test1 | |
19 pulling from ../test1 | |
20 requesting all changes | |
21 adding changesets | |
22 adding manifests | |
23 adding file changes | |
24 added 1 changesets with 2 changes to 2 files | |
25 (run 'hg update' to get a working copy) | |
26 $ hg co | |
27 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
28 $ chmod +x a | |
29 $ hg ci -m "chmod +x a" -d "1000000 0" | |
30 | |
31 the changelog should mention file a: | |
32 | |
33 $ hg tip --template '{files}\n' | |
34 a | |
35 | |
36 $ cd ../test1 | |
37 $ echo 123 >>a | |
38 $ hg ci -m "a updated" -d "1000000 0" | |
39 | |
40 $ hg pull ../test2 | |
41 pulling from ../test2 | |
42 searching for changes | |
43 adding changesets | |
44 adding manifests | |
45 adding file changes | |
46 added 1 changesets with 0 changes to 0 files (+1 heads) | |
47 (run 'hg heads' to see heads, 'hg merge' to merge) | |
48 $ hg heads | |
49 changeset: 2:37dccb76c058 | |
50 tag: tip | |
51 parent: 0:4536b1c2ca69 | |
52 user: test | |
53 date: Mon Jan 12 13:46:40 1970 +0000 | |
54 summary: chmod +x a | |
55 | |
56 changeset: 1:a187cb361a5a | |
57 user: test | |
58 date: Mon Jan 12 13:46:40 1970 +0000 | |
59 summary: a updated | |
60 | |
61 $ hg history | |
62 changeset: 2:37dccb76c058 | |
63 tag: tip | |
64 parent: 0:4536b1c2ca69 | |
65 user: test | |
66 date: Mon Jan 12 13:46:40 1970 +0000 | |
67 summary: chmod +x a | |
68 | |
69 changeset: 1:a187cb361a5a | |
70 user: test | |
71 date: Mon Jan 12 13:46:40 1970 +0000 | |
72 summary: a updated | |
73 | |
74 changeset: 0:4536b1c2ca69 | |
75 user: test | |
76 date: Mon Jan 12 13:46:40 1970 +0000 | |
77 summary: added a b | |
78 | |
79 | |
80 $ hg -v merge | |
81 resolving manifests | |
82 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
83 (branch merge, don't forget to commit) | |
84 | |
85 $ cd ../test3 | |
86 $ echo 123 >>b | |
87 $ hg ci -m "b updated" -d "1000000 0" | |
88 | |
89 $ hg pull ../test2 | |
90 pulling from ../test2 | |
91 searching for changes | |
92 adding changesets | |
93 adding manifests | |
94 adding file changes | |
95 added 1 changesets with 0 changes to 0 files (+1 heads) | |
96 (run 'hg heads' to see heads, 'hg merge' to merge) | |
97 $ hg heads | |
98 changeset: 2:37dccb76c058 | |
99 tag: tip | |
100 parent: 0:4536b1c2ca69 | |
101 user: test | |
102 date: Mon Jan 12 13:46:40 1970 +0000 | |
103 summary: chmod +x a | |
104 | |
105 changeset: 1:d54568174d8e | |
106 user: test | |
107 date: Mon Jan 12 13:46:40 1970 +0000 | |
108 summary: b updated | |
109 | |
110 $ hg history | |
111 changeset: 2:37dccb76c058 | |
112 tag: tip | |
113 parent: 0:4536b1c2ca69 | |
114 user: test | |
115 date: Mon Jan 12 13:46:40 1970 +0000 | |
116 summary: chmod +x a | |
117 | |
118 changeset: 1:d54568174d8e | |
119 user: test | |
120 date: Mon Jan 12 13:46:40 1970 +0000 | |
121 summary: b updated | |
122 | |
123 changeset: 0:4536b1c2ca69 | |
124 user: test | |
125 date: Mon Jan 12 13:46:40 1970 +0000 | |
126 summary: added a b | |
127 | |
128 | |
129 $ hg -v merge | |
130 resolving manifests | |
131 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
132 (branch merge, don't forget to commit) | |
133 | |
134 $ ls -l ../test[123]/a > foo | |
135 $ cut -b 1-10 < foo | |
136 -rwxr-x--- | |
137 -rwxr-x--- | |
138 -rwxr-x--- | |
139 | |
140 $ hg debugindex .hg/store/data/a.i | |
141 rev offset length base linkrev nodeid p1 p2 | |
142 0 0 0 0 0 b80de5d13875 000000000000 000000000000 | |
143 $ hg debugindex ../test2/.hg/store/data/a.i | |
144 rev offset length base linkrev nodeid p1 p2 | |
145 0 0 0 0 0 b80de5d13875 000000000000 000000000000 | |
146 $ hg debugindex ../test1/.hg/store/data/a.i | |
147 rev offset length base linkrev nodeid p1 p2 | |
148 0 0 0 0 0 b80de5d13875 000000000000 000000000000 | |
149 1 0 5 1 1 7fe919cc0336 b80de5d13875 000000000000 |