Mercurial > hg
comparison tests/test-subrepo.t @ 31516:2915cc1d3429 stable
subrepo: move prompts out of the if (issue5505)
Prompts weren't available in the else clause
| author | Simon Farnsworth <simonfar@fb.com> |
|---|---|
| date | Mon, 20 Mar 2017 04:36:55 -0700 |
| parents | d4ec69ff652a |
| children | 3433bf56b768 |
comparison
equal
deleted
inserted
replaced
| 31474:10c0ee338535 | 31516:2915cc1d3429 |
|---|---|
| 347 revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 | 347 revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 |
| 348 | 348 |
| 349 local removed, remote changed, keep changed | 349 local removed, remote changed, keep changed |
| 350 | 350 |
| 351 $ hg merge 6 | 351 $ hg merge 6 |
| 352 remote [merge rev] changed subrepository s which local [working copy] removed | 352 remote [merge rev] changed subrepository t which local [working copy] removed |
| 353 use (c)hanged version or (d)elete? c | 353 use (c)hanged version or (d)elete? c |
| 354 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 354 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 355 (branch merge, don't forget to commit) | 355 (branch merge, don't forget to commit) |
| 356 BROKEN: should include subrepo t | 356 BROKEN: should include subrepo t |
| 357 $ hg debugsub | 357 $ hg debugsub |
| 378 $ hg co -C 11 | 378 $ hg co -C 11 |
| 379 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 379 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 380 $ hg merge --config ui.interactive=true 6 <<EOF | 380 $ hg merge --config ui.interactive=true 6 <<EOF |
| 381 > d | 381 > d |
| 382 > EOF | 382 > EOF |
| 383 remote [merge rev] changed subrepository s which local [working copy] removed | 383 remote [merge rev] changed subrepository t which local [working copy] removed |
| 384 use (c)hanged version or (d)elete? d | 384 use (c)hanged version or (d)elete? d |
| 385 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 385 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 386 (branch merge, don't forget to commit) | 386 (branch merge, don't forget to commit) |
| 387 $ hg debugsub | 387 $ hg debugsub |
| 388 path s | 388 path s |
| 402 local changed, remote removed, keep changed | 402 local changed, remote removed, keep changed |
| 403 | 403 |
| 404 $ hg co -C 6 | 404 $ hg co -C 6 |
| 405 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 405 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 406 $ hg merge 11 | 406 $ hg merge 11 |
| 407 local [working copy] changed subrepository s which remote [merge rev] removed | 407 local [working copy] changed subrepository t which remote [merge rev] removed |
| 408 use (c)hanged version or (d)elete? c | 408 use (c)hanged version or (d)elete? c |
| 409 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 409 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 410 (branch merge, don't forget to commit) | 410 (branch merge, don't forget to commit) |
| 411 BROKEN: should include subrepo t | 411 BROKEN: should include subrepo t |
| 412 $ hg debugsub | 412 $ hg debugsub |
| 434 $ hg co -C 6 | 434 $ hg co -C 6 |
| 435 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 435 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 436 $ hg merge --config ui.interactive=true 11 <<EOF | 436 $ hg merge --config ui.interactive=true 11 <<EOF |
| 437 > d | 437 > d |
| 438 > EOF | 438 > EOF |
| 439 local [working copy] changed subrepository s which remote [merge rev] removed | 439 local [working copy] changed subrepository t which remote [merge rev] removed |
| 440 use (c)hanged version or (d)elete? d | 440 use (c)hanged version or (d)elete? d |
| 441 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 441 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 442 (branch merge, don't forget to commit) | 442 (branch merge, don't forget to commit) |
| 443 $ hg debugsub | 443 $ hg debugsub |
| 444 path s | 444 path s |