| author | Matt Mackall <mpm@selenic.com> |
| Sun, 08 Nov 2009 10:29:52 -0600 | |
| changeset 9783 | ee00ef6f9be7 |
| parent 9611 | a3d73b3e1f8a |
| child 10177 | 5ca0d220ae21 |
| child 10251 | a19d2993385d |
| permissions | -rw-r--r-- |
| 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 |
|
|
9783
ee00ef6f9be7
submerge: properly deal with overwrites
Matt Mackall <mpm@selenic.com>
parents:
9611
diff
changeset
|
59 |
subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec |
|
ee00ef6f9be7
submerge: properly deal with overwrites
Matt Mackall <mpm@selenic.com>
parents:
9611
diff
changeset
|
60 |
subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad |
|
ee00ef6f9be7
submerge: properly deal with overwrites
Matt Mackall <mpm@selenic.com>
parents:
9611
diff
changeset
|
61 |
getting subrepo t |
| 8816 | 62 |
resolving manifests |
63 |
overwrite True partial False |
|
64 |
ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a |
|
65 |
t: remote is newer -> g |
|
66 |
getting t |
|
67 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
68 |
(branch merge, don't forget to commit) |
|
69 |
path s |
|
70 |
source s |
|
71 |
revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 |
|
72 |
path t |
|
73 |
source t |
|
74 |
revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad |
|
75 |
committing subrepository t |
|
76 |
searching for copies back to rev 2 |
|
77 |
resolving manifests |
|
78 |
overwrite None partial False |
|
79 |
ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf |
|
80 |
.hgsubstate: versions differ -> m |
|
|
9783
ee00ef6f9be7
submerge: properly deal with overwrites
Matt Mackall <mpm@selenic.com>
parents:
9611
diff
changeset
|
81 |
subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 |
|
ee00ef6f9be7
submerge: properly deal with overwrites
Matt Mackall <mpm@selenic.com>
parents:
9611
diff
changeset
|
82 |
subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4 |
|
ee00ef6f9be7
submerge: properly deal with overwrites
Matt Mackall <mpm@selenic.com>
parents:
9611
diff
changeset
|
83 |
merging subrepo t |
| 8816 | 84 |
searching for copies back to rev 2 |
85 |
resolving manifests |
|
86 |
overwrite None partial False |
|
87 |
ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198 |
|
88 |
t: versions differ -> m |
|
89 |
preserving t for resolve of t |
|
90 |
picked tool 'internal:merge' for t (binary False symlink False) |
|
91 |
merging t |
|
92 |
my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
|
93 |
warning: conflicts during merge. |
|
94 |
merging t failed! |
|
95 |
0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
|
9468
b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Stuart W Marks <smarks@smarks.org>
parents:
8995
diff
changeset
|
96 |
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 8816 | 97 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
98 |
(branch merge, don't forget to commit) |
|
99 |
% should conflict |
|
100 |
<<<<<<< local |
|
101 |
conflict |
|
102 |
======= |
|
103 |
t3 |
|
104 |
>>>>>>> other |
|
105 |
% clone |
|
|
9611
a3d73b3e1f8a
hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents:
9468
diff
changeset
|
106 |
updating to branch default |
| 8816 | 107 |
pulling subrepo s |
108 |
requesting all changes |
|
109 |
adding changesets |
|
110 |
adding manifests |
|
111 |
adding file changes |
|
112 |
added 4 changesets with 5 changes to 3 files |
|
113 |
pulling subrepo ss |
|
114 |
requesting all changes |
|
115 |
adding changesets |
|
116 |
adding manifests |
|
117 |
adding file changes |
|
118 |
added 1 changesets with 1 changes to 1 files |
|
119 |
pulling subrepo t |
|
120 |
requesting all changes |
|
121 |
adding changesets |
|
122 |
adding manifests |
|
123 |
adding file changes |
|
124 |
added 4 changesets with 4 changes to 1 files (+1 heads) |
|
125 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
126 |
path s |
|
127 |
source s |
|
128 |
revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 |
|
129 |
path t |
|
130 |
source t |
|
131 |
revision 20a0db6fbf6c3d2836e6519a642ae929bfc67c0e |
|
132 |
% push |
|
133 |
committing subrepository t |
|
134 |
pushing ...sub/t |
|
135 |
pushing ...subrepo ss |
|
136 |
searching for changes |
|
137 |
no changes found |
|
138 |
pushing ...subrepo s |
|
139 |
searching for changes |
|
140 |
no changes found |
|
141 |
pushing ...subrepo t |
|
142 |
searching for changes |
|
143 |
adding changesets |
|
144 |
adding manifests |
|
145 |
adding file changes |
|
146 |
added 1 changesets with 1 changes to 1 files |
|
147 |
searching for changes |
|
148 |
adding changesets |
|
149 |
adding manifests |
|
150 |
adding file changes |
|
151 |
added 1 changesets with 1 changes to 1 files |
|
152 |
% push -f |
|
153 |
committing subrepository s |
|
154 |
abort: push creates new remote heads! |
|
155 |
pushing ...sub/t |
|
156 |
pushing ...subrepo ss |
|
157 |
searching for changes |
|
158 |
no changes found |
|
159 |
pushing ...subrepo s |
|
160 |
searching for changes |
|
161 |
(did you forget to merge? use push -f to force) |
|
162 |
pushing ...subrepo t |
|
163 |
searching for changes |
|
164 |
no changes found |
|
165 |
searching for changes |
|
166 |
adding changesets |
|
167 |
adding manifests |
|
168 |
adding file changes |
|
169 |
added 1 changesets with 1 changes to 1 files |
|
170 |
pushing ...sub/t |
|
171 |
pushing ...subrepo ss |
|
172 |
searching for changes |
|
173 |
no changes found |
|
174 |
pushing ...subrepo s |
|
175 |
searching for changes |
|
176 |
adding changesets |
|
177 |
adding manifests |
|
178 |
adding file changes |
|
179 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
|
180 |
pushing ...subrepo t |
|
181 |
searching for changes |
|
182 |
no changes found |
|
183 |
searching for changes |
|
184 |
no changes found |
|
185 |
% update |
|
186 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
187 |
committing subrepository t |
|
188 |
% pull |
|
189 |
pulling ...sub/t |
|
190 |
searching for changes |
|
191 |
adding changesets |
|
192 |
adding manifests |
|
193 |
adding file changes |
|
194 |
added 1 changesets with 1 changes to 1 files |
|
195 |
(run 'hg update' to get a working copy) |
|
196 |
pulling subrepo t |
|
197 |
searching for changes |
|
198 |
adding changesets |
|
199 |
adding manifests |
|
200 |
adding file changes |
|
201 |
added 1 changesets with 1 changes to 1 files |
|
202 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
203 |
blah |