Show More
@@ -245,7 +245,7 b' def submerge(repo, wctx, mctx, actx, ove' | |||
|
245 | 245 | 'use (c)hanged version or (d)elete?' |
|
246 | 246 | '$$ &Changed $$ &Delete') % s, 0) == 0: |
|
247 | 247 | debug(s, "prompt recreate", r) |
|
248 |
|
|
|
248 | mctx.sub(s).get(r) | |
|
249 | 249 | sm[s] = r |
|
250 | 250 | |
|
251 | 251 | # record merged .hgsubstate |
@@ -304,6 +304,138 b' should conflict' | |||
|
304 | 304 | t3 |
|
305 | 305 | >>>>>>> other: 7af322bc1198 - test: 7 |
|
306 | 306 | |
|
307 | 11: remove subrepo t | |
|
308 | ||
|
309 | $ hg co -C 5 | |
|
310 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
311 | $ hg revert -r 4 .hgsub # remove t | |
|
312 | $ hg ci -m11 | |
|
313 | created new head | |
|
314 | $ hg debugsub | |
|
315 | path s | |
|
316 | source s | |
|
317 | revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 | |
|
318 | ||
|
319 | local removed, remote changed, keep changed | |
|
320 | ||
|
321 | $ hg merge 6 | |
|
322 | remote changed subrepository t which local removed | |
|
323 | use (c)hanged version or (d)elete? c | |
|
324 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
325 | (branch merge, don't forget to commit) | |
|
326 | BROKEN: should include subrepo t | |
|
327 | $ hg debugsub | |
|
328 | path s | |
|
329 | source s | |
|
330 | revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 | |
|
331 | $ cat .hgsubstate | |
|
332 | e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s | |
|
333 | 6747d179aa9a688023c4b0cad32e4c92bb7f34ad t | |
|
334 | $ hg ci -m 'local removed, remote changed, keep changed' | |
|
335 | BROKEN: should include subrepo t | |
|
336 | $ hg debugsub | |
|
337 | path s | |
|
338 | source s | |
|
339 | revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 | |
|
340 | BROKEN: should include subrepo t | |
|
341 | $ cat .hgsubstate | |
|
342 | e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s | |
|
343 | $ cat t/t | |
|
344 | t2 | |
|
345 | ||
|
346 | local removed, remote changed, keep removed | |
|
347 | ||
|
348 | $ hg co -C 11 | |
|
349 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
350 | $ hg merge --config ui.interactive=true 6 <<EOF | |
|
351 | > d | |
|
352 | > EOF | |
|
353 | remote changed subrepository t which local removed | |
|
354 | use (c)hanged version or (d)elete? d | |
|
355 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
356 | (branch merge, don't forget to commit) | |
|
357 | $ hg debugsub | |
|
358 | path s | |
|
359 | source s | |
|
360 | revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 | |
|
361 | $ cat .hgsubstate | |
|
362 | e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s | |
|
363 | $ hg ci -m 'local removed, remote changed, keep removed' | |
|
364 | created new head | |
|
365 | $ hg debugsub | |
|
366 | path s | |
|
367 | source s | |
|
368 | revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 | |
|
369 | $ cat .hgsubstate | |
|
370 | e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s | |
|
371 | ||
|
372 | local changed, remote removed, keep changed | |
|
373 | ||
|
374 | $ hg co -C 6 | |
|
375 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
376 | $ hg merge 11 | |
|
377 | local changed subrepository t which remote removed | |
|
378 | use (c)hanged version or (d)elete? c | |
|
379 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
380 | (branch merge, don't forget to commit) | |
|
381 | BROKEN: should include subrepo t | |
|
382 | $ hg debugsub | |
|
383 | path s | |
|
384 | source s | |
|
385 | revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 | |
|
386 | BROKEN: should include subrepo t | |
|
387 | $ cat .hgsubstate | |
|
388 | e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s | |
|
389 | $ hg ci -m 'local changed, remote removed, keep changed' | |
|
390 | created new head | |
|
391 | BROKEN: should include subrepo t | |
|
392 | $ hg debugsub | |
|
393 | path s | |
|
394 | source s | |
|
395 | revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 | |
|
396 | BROKEN: should include subrepo t | |
|
397 | $ cat .hgsubstate | |
|
398 | e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s | |
|
399 | $ cat t/t | |
|
400 | t2 | |
|
401 | ||
|
402 | local changed, remote removed, keep removed | |
|
403 | ||
|
404 | $ hg co -C 6 | |
|
405 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
406 | $ hg merge --config ui.interactive=true 11 <<EOF | |
|
407 | > d | |
|
408 | > EOF | |
|
409 | local changed subrepository t which remote removed | |
|
410 | use (c)hanged version or (d)elete? d | |
|
411 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
412 | (branch merge, don't forget to commit) | |
|
413 | $ hg debugsub | |
|
414 | path s | |
|
415 | source s | |
|
416 | revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 | |
|
417 | $ cat .hgsubstate | |
|
418 | e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s | |
|
419 | $ hg ci -m 'local changed, remote removed, keep removed' | |
|
420 | created new head | |
|
421 | $ hg debugsub | |
|
422 | path s | |
|
423 | source s | |
|
424 | revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 | |
|
425 | $ cat .hgsubstate | |
|
426 | e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s | |
|
427 | ||
|
428 | clean up to avoid having to fix up the tests below | |
|
429 | ||
|
430 | $ hg co -C 10 | |
|
431 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
432 | $ cat >> $HGRCPATH <<EOF | |
|
433 | > [extensions] | |
|
434 | > strip= | |
|
435 | > EOF | |
|
436 | $ hg strip -r 11:15 | |
|
437 | saved backup bundle to $TESTTMP/t/.hg/strip-backup/*-backup.hg (glob) | |
|
438 | ||
|
307 | 439 | clone |
|
308 | 440 | |
|
309 | 441 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now