Mercurial > hg
comparison tests/test-subrepo.out @ 8816:a7c4eb0cc0ed
subrepo: add a test
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 15 Jun 2009 02:51:10 -0500 |
parents | |
children | 7b19cda0fa10 |
comparison
equal
deleted
inserted
replaced
8815:e87b0fc4750b | 8816:a7c4eb0cc0ed |
---|---|
1 % first revision, no sub | |
2 adding a | |
3 % add first sub | |
4 adding a | |
5 committing subrepository s | |
6 nothing changed | |
7 % add sub sub | |
8 committing subrepository s | |
9 committing subrepository ss | |
10 % bump sub rev | |
11 committing subrepository s | |
12 nothing changed | |
13 % leave sub dirty | |
14 committing subrepository s | |
15 changeset: 3:1c833a7a9e3a | |
16 tag: tip | |
17 user: test | |
18 date: Thu Jan 01 00:00:00 1970 +0000 | |
19 summary: 4 | |
20 | |
21 % check caching | |
22 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
23 % restore | |
24 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
25 path s | |
26 source s | |
27 revision 1c833a7a9e3a4445c711aaf0f012379cd0d4034e | |
28 % new branch for merge tests | |
29 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
30 adding t/t | |
31 % 5 | |
32 committing subrepository t | |
33 created new head | |
34 % 6 | |
35 committing subrepository t | |
36 path s | |
37 source s | |
38 revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 | |
39 path t | |
40 source t | |
41 revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad | |
42 % 7 | |
43 committing subrepository t | |
44 % 8 | |
45 % merge tests | |
46 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
47 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
48 (branch merge, don't forget to commit) | |
49 path s | |
50 source s | |
51 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 | |
52 path t | |
53 source t | |
54 revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382 | |
55 created new head | |
56 searching for copies back to rev 2 | |
57 resolving manifests | |
58 overwrite None partial False | |
59 ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4 | |
60 .hgsubstate: versions differ -> m | |
61 resolving manifests | |
62 overwrite True partial False | |
63 ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a | |
64 t: remote is newer -> g | |
65 getting t | |
66 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
67 (branch merge, don't forget to commit) | |
68 path s | |
69 source s | |
70 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 | |
71 path t | |
72 source t | |
73 revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad | |
74 committing subrepository t | |
75 searching for copies back to rev 2 | |
76 resolving manifests | |
77 overwrite None partial False | |
78 ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf | |
79 .hgsubstate: versions differ -> m | |
80 searching for copies back to rev 2 | |
81 resolving manifests | |
82 overwrite None partial False | |
83 ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198 | |
84 t: versions differ -> m | |
85 preserving t for resolve of t | |
86 picked tool 'internal:merge' for t (binary False symlink False) | |
87 merging t | |
88 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a | |
89 warning: conflicts during merge. | |
90 merging t failed! | |
91 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
92 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon | |
93 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
94 (branch merge, don't forget to commit) | |
95 % should conflict | |
96 <<<<<<< local | |
97 conflict | |
98 ======= | |
99 t3 | |
100 >>>>>>> other | |
101 % clone | |
102 updating working directory | |
103 pulling subrepo s | |
104 requesting all changes | |
105 adding changesets | |
106 adding manifests | |
107 adding file changes | |
108 added 4 changesets with 5 changes to 3 files | |
109 pulling subrepo ss | |
110 requesting all changes | |
111 adding changesets | |
112 adding manifests | |
113 adding file changes | |
114 added 1 changesets with 1 changes to 1 files | |
115 pulling subrepo t | |
116 requesting all changes | |
117 adding changesets | |
118 adding manifests | |
119 adding file changes | |
120 added 4 changesets with 4 changes to 1 files (+1 heads) | |
121 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
122 path s | |
123 source s | |
124 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 | |
125 path t | |
126 source t | |
127 revision 20a0db6fbf6c3d2836e6519a642ae929bfc67c0e | |
128 % push | |
129 committing subrepository t | |
130 pushing ...sub/t | |
131 pushing ...subrepo ss | |
132 searching for changes | |
133 no changes found | |
134 pushing ...subrepo s | |
135 searching for changes | |
136 no changes found | |
137 pushing ...subrepo t | |
138 searching for changes | |
139 adding changesets | |
140 adding manifests | |
141 adding file changes | |
142 added 1 changesets with 1 changes to 1 files | |
143 searching for changes | |
144 adding changesets | |
145 adding manifests | |
146 adding file changes | |
147 added 1 changesets with 1 changes to 1 files | |
148 % push -f | |
149 committing subrepository s | |
150 abort: push creates new remote heads! | |
151 pushing ...sub/t | |
152 pushing ...subrepo ss | |
153 searching for changes | |
154 no changes found | |
155 pushing ...subrepo s | |
156 searching for changes | |
157 (did you forget to merge? use push -f to force) | |
158 pushing ...subrepo t | |
159 searching for changes | |
160 no changes found | |
161 searching for changes | |
162 adding changesets | |
163 adding manifests | |
164 adding file changes | |
165 added 1 changesets with 1 changes to 1 files | |
166 pushing ...sub/t | |
167 pushing ...subrepo ss | |
168 searching for changes | |
169 no changes found | |
170 pushing ...subrepo s | |
171 searching for changes | |
172 adding changesets | |
173 adding manifests | |
174 adding file changes | |
175 added 1 changesets with 1 changes to 1 files (+1 heads) | |
176 pushing ...subrepo t | |
177 searching for changes | |
178 no changes found | |
179 searching for changes | |
180 no changes found | |
181 % update | |
182 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
183 committing subrepository t | |
184 % pull | |
185 pulling ...sub/t | |
186 searching for changes | |
187 adding changesets | |
188 adding manifests | |
189 adding file changes | |
190 added 1 changesets with 1 changes to 1 files | |
191 (run 'hg update' to get a working copy) | |
192 pulling subrepo t | |
193 searching for changes | |
194 adding changesets | |
195 adding manifests | |
196 adding file changes | |
197 added 1 changesets with 1 changes to 1 files | |
198 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
199 blah |