155 |
156 |
156 $ hg log -r tip | grep "^user" |
157 $ hg log -r tip | grep "^user" |
157 user: baruser, foouser |
158 user: baruser, foouser |
158 |
159 |
159 $ cd .. |
160 $ cd .. |
|
161 |
|
162 Test the content-divergence resolution involving date update |
|
163 ------------------------------------------------------------ |
|
164 |
|
165 $ hg init divergingdate |
|
166 $ cd divergingdate |
|
167 $ unset HGUSER |
|
168 $ echo "[ui]" >> ./.hg/hgrc |
|
169 $ echo "username = test" >> ./.hg/hgrc |
|
170 |
|
171 $ echo hi > r0 |
|
172 $ hg ci -qAm 'add r0' |
|
173 $ echo hi > foo.txt |
|
174 $ hg ci -qAm 'add foo.txt' |
|
175 $ hg metaedit -r . -d '0 2' |
|
176 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
177 |
|
178 date: updated on both side to the same value |
|
179 |
|
180 $ echo hi > bar.txt |
|
181 $ hg add -q bar.txt |
|
182 $ hg amend -q |
|
183 $ hg metaedit -r 1 -d '0 1' --hidden |
|
184 2 new content-divergent changesets |
|
185 $ hg log -G |
|
186 * changeset: 4:c17bf400a278 |
|
187 | tag: tip |
|
188 | parent: 0:a24ed8ad918c |
|
189 | user: test |
|
190 | date: Wed Dec 31 23:59:59 1969 -0000 |
|
191 | instability: content-divergent |
|
192 | summary: add foo.txt |
|
193 | |
|
194 | @ changeset: 3:a25dd7af6cf6 |
|
195 |/ parent: 0:a24ed8ad918c |
|
196 | user: test |
|
197 | date: Wed Dec 31 23:59:58 1969 -0000 |
|
198 | instability: content-divergent |
|
199 | summary: add foo.txt |
|
200 | |
|
201 o changeset: 0:a24ed8ad918c |
|
202 user: test |
|
203 date: Thu Jan 01 00:00:00 1970 +0000 |
|
204 summary: add r0 |
|
205 |
|
206 $ hg evolve --list --rev . |
|
207 a25dd7af6cf6: add foo.txt |
|
208 content-divergent: c17bf400a278 (draft) (precursor cc71ffbc7c00) |
|
209 |
|
210 $ hg log --hidden -r cc71ffbc7c00 -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
211 1 cc71ffbc7c00 1970-01-01 00:00 +0000: date-changed using metaedit as 4:c17bf400a278; date-changed using metaedit as 2:0065551bd38f |
|
212 $ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
213 3 a25dd7af6cf6 1969-12-31 23:59 -0000: |
|
214 4 c17bf400a278 1969-12-31 23:59 -0000: |
|
215 $ hg evolve --content-divergent |
|
216 merge:[3] add foo.txt |
|
217 with: [4] add foo.txt |
|
218 base: [1] add foo.txt |
|
219 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
220 working directory is now at 6c144bb30333 |
|
221 $ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
222 5 6c144bb30333 1969-12-31 23:59 -0000: |
|
223 |
|
224 date: updated one one side to an older value |
|
225 |
|
226 $ hg strip . |
|
227 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
228 saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/6c144bb30333-72e26b88-backup.hg |
|
229 2 new content-divergent changesets |
|
230 $ hg up tip |
|
231 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
232 $ hg amend --date "0 3" |
|
233 $ hg log -G |
|
234 @ changeset: 5:6189a9adfff0 |
|
235 | tag: tip |
|
236 | parent: 0:a24ed8ad918c |
|
237 | user: test |
|
238 | date: Wed Dec 31 23:59:57 1969 -0000 |
|
239 | instability: content-divergent |
|
240 | summary: add foo.txt |
|
241 | |
|
242 | * changeset: 3:a25dd7af6cf6 |
|
243 |/ parent: 0:a24ed8ad918c |
|
244 | user: test |
|
245 | date: Wed Dec 31 23:59:58 1969 -0000 |
|
246 | instability: content-divergent |
|
247 | summary: add foo.txt |
|
248 | |
|
249 o changeset: 0:a24ed8ad918c |
|
250 user: test |
|
251 date: Thu Jan 01 00:00:00 1970 +0000 |
|
252 summary: add r0 |
|
253 |
|
254 $ hg evolve --list -r . |
|
255 6189a9adfff0: add foo.txt |
|
256 content-divergent: a25dd7af6cf6 (draft) (precursor cc71ffbc7c00) |
|
257 |
|
258 $ hg log -r cc71ffbc7c00+6189a9adfff0+a25dd7af6cf6 --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
259 1 cc71ffbc7c00 1970-01-01 00:00 +0000: date-changed using metaedit as 4:c17bf400a278; date-changed using metaedit as 2:0065551bd38f |
|
260 5 6189a9adfff0 1969-12-31 23:59 -0000: |
|
261 3 a25dd7af6cf6 1969-12-31 23:59 -0000: |
|
262 $ hg evolve --content-divergent |
|
263 merge:[3] add foo.txt |
|
264 with: [5] add foo.txt |
|
265 base: [1] add foo.txt |
|
266 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
267 working directory is now at 806d0024c04d |
|
268 $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
269 6 806d0024c04d 1969-12-31 23:59 -0000: |
|
270 |
|
271 date: updated one side to an newer value |
|
272 |
|
273 $ hg strip . |
|
274 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
275 saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/806d0024c04d-24cb28ad-backup.hg |
|
276 2 new content-divergent changesets |
|
277 $ hg update a25dd7af6cf6 --hidden |
|
278 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
279 $ hg amend --date "120 0" |
|
280 $ hg log -G |
|
281 @ changeset: 6:5199d0bc13d4 |
|
282 | tag: tip |
|
283 | parent: 0:a24ed8ad918c |
|
284 | user: test |
|
285 | date: Thu Jan 01 00:02:00 1970 +0000 |
|
286 | instability: content-divergent |
|
287 | summary: add foo.txt |
|
288 | |
|
289 | * changeset: 5:6189a9adfff0 |
|
290 |/ parent: 0:a24ed8ad918c |
|
291 | user: test |
|
292 | date: Wed Dec 31 23:59:57 1969 -0000 |
|
293 | instability: content-divergent |
|
294 | summary: add foo.txt |
|
295 | |
|
296 o changeset: 0:a24ed8ad918c |
|
297 user: test |
|
298 date: Thu Jan 01 00:00:00 1970 +0000 |
|
299 summary: add r0 |
|
300 |
|
301 $ hg evolve --list -r . |
|
302 5199d0bc13d4: add foo.txt |
|
303 content-divergent: 6189a9adfff0 (draft) (precursor cc71ffbc7c00) |
|
304 |
|
305 $ hg up 6189a9adfff0 |
|
306 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
307 $ hg log -r cc71ffbc7c00+6189a9adfff0+5199d0bc13d4 --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
308 1 cc71ffbc7c00 1970-01-01 00:00 +0000: date-changed using metaedit as 4:c17bf400a278; date-changed using metaedit as 2:0065551bd38f |
|
309 5 6189a9adfff0 1969-12-31 23:59 -0000: |
|
310 6 5199d0bc13d4 1970-01-01 00:02 +0000: |
|
311 $ hg evolve --content-divergent |
|
312 merge:[5] add foo.txt |
|
313 with: [6] add foo.txt |
|
314 base: [1] add foo.txt |
|
315 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
316 working directory is now at 51e08ac59670 |
|
317 $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
318 7 51e08ac59670 1970-01-01 00:02 +0000: |
|
319 |
|
320 date: updated each side to a different value, newer should win |
|
321 |
|
322 $ hg strip . |
|
323 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
324 saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/51e08ac59670-d8a3c2ca-backup.hg |
|
325 2 new content-divergent changesets |
|
326 $ hg up tip |
|
327 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
328 $ hg amend --date "235 0" |
|
329 $ hg update 6189a9adfff0 --hidden |
|
330 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
331 $ hg amend --date "784 0" |
|
332 $ hg log -G |
|
333 @ changeset: 8:75254fb3164b |
|
334 | tag: tip |
|
335 | parent: 0:a24ed8ad918c |
|
336 | user: test |
|
337 | date: Thu Jan 01 00:13:04 1970 +0000 |
|
338 | instability: content-divergent |
|
339 | summary: add foo.txt |
|
340 | |
|
341 | * changeset: 7:5421a7efcc6e |
|
342 |/ parent: 0:a24ed8ad918c |
|
343 | user: test |
|
344 | date: Thu Jan 01 00:03:55 1970 +0000 |
|
345 | instability: content-divergent |
|
346 | summary: add foo.txt |
|
347 | |
|
348 o changeset: 0:a24ed8ad918c |
|
349 user: test |
|
350 date: Thu Jan 01 00:00:00 1970 +0000 |
|
351 summary: add r0 |
|
352 |
|
353 $ hg evolve --list -r . |
|
354 75254fb3164b: add foo.txt |
|
355 content-divergent: 5421a7efcc6e (draft) (precursor cc71ffbc7c00) |
|
356 |
|
357 $ hg log -r 6189a9adfff0+5421a7efcc6e+75254fb3164b --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
358 5 6189a9adfff0 1969-12-31 23:59 -0000: date-changed using amend as 8:75254fb3164b |
|
359 7 5421a7efcc6e 1970-01-01 00:03 +0000: |
|
360 8 75254fb3164b 1970-01-01 00:13 +0000: |
|
361 $ hg evolve --content-divergent |
|
362 merge:[7] add foo.txt |
|
363 with: [8] add foo.txt |
|
364 base: [1] add foo.txt |
|
365 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
366 working directory is now at ab7c0a425dc9 |
|
367 $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
368 9 ab7c0a425dc9 1970-01-01 00:13 +0000: |
|
369 |
|
370 $ cd .. |