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