Mercurial > hg
comparison tests/test-subrepo-git.t @ 21401:2c364f7801c8
subrepo: use subrepo shortid method to generate subrepo diverged promptchoice
We were always using only the first 12 characters of the subrepo revision id
when generating the "subrepo diverged" promptchoice. This is not necessarily
correct for non mercurial subrepos.
| author | Angel Ezquerra <angel.ezquerra@gmail.com> |
|---|---|
| date | Wed, 07 May 2014 00:13:22 +0200 |
| parents | 7731a2281cf0 |
| children | 652e07debf10 |
comparison
equal
deleted
inserted
replaced
| 21400:78a60daacea8 | 21401:2c364f7801c8 |
|---|---|
| 153 adding manifests | 153 adding manifests |
| 154 adding file changes | 154 adding file changes |
| 155 added 1 changesets with 1 changes to 1 files (+1 heads) | 155 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 156 (run 'hg heads' to see heads, 'hg merge' to merge) | 156 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 157 $ hg merge 2>/dev/null | 157 $ hg merge 2>/dev/null |
| 158 subrepository s diverged (local revision: 796959400868, remote revision: aa84837ccfbd) | 158 subrepository s diverged (local revision: 7969594, remote revision: aa84837) |
| 159 (M)erge, keep (l)ocal or keep (r)emote? m | 159 (M)erge, keep (l)ocal or keep (r)emote? m |
| 160 pulling subrepo s from $TESTTMP/gitroot | 160 pulling subrepo s from $TESTTMP/gitroot |
| 161 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 161 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 162 (branch merge, don't forget to commit) | 162 (branch merge, don't forget to commit) |
| 163 $ cat s/f | 163 $ cat s/f |
| 462 $ cd s | 462 $ cd s |
| 463 $ git rev-parse HEAD | 463 $ git rev-parse HEAD |
| 464 da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 | 464 da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
| 465 $ cd .. | 465 $ cd .. |
| 466 $ hg update 4 | 466 $ hg update 4 |
| 467 subrepository s diverged (local revision: da5f5b1d8ffc, remote revision: aa84837ccfbd) | 467 subrepository s diverged (local revision: da5f5b1, remote revision: aa84837) |
| 468 (M)erge, keep (l)ocal or keep (r)emote? m | 468 (M)erge, keep (l)ocal or keep (r)emote? m |
| 469 subrepository sources for s differ | 469 subrepository sources for s differ |
| 470 use (l)ocal source (da5f5b1) or (r)emote source (aa84837)? | 470 use (l)ocal source (da5f5b1) or (r)emote source (aa84837)? |
| 471 l | 471 l |
| 472 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 472 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 489 $ git checkout aa84837ccfbdfedcdcdeeedc309d73e6eb069edc | 489 $ git checkout aa84837ccfbdfedcdcdeeedc309d73e6eb069edc |
| 490 Previous HEAD position was 32a3438... fff | 490 Previous HEAD position was 32a3438... fff |
| 491 HEAD is now at aa84837... f | 491 HEAD is now at aa84837... f |
| 492 $ cd .. | 492 $ cd .. |
| 493 $ hg update 1 | 493 $ hg update 1 |
| 494 subrepository s diverged (local revision: 32a343883b74, remote revision: da5f5b1d8ffc) | 494 subrepository s diverged (local revision: 32a3438, remote revision: da5f5b1) |
| 495 (M)erge, keep (l)ocal or keep (r)emote? m | 495 (M)erge, keep (l)ocal or keep (r)emote? m |
| 496 subrepository sources for s differ (in checked out version) | 496 subrepository sources for s differ (in checked out version) |
| 497 use (l)ocal source (32a3438) or (r)emote source (da5f5b1)? | 497 use (l)ocal source (32a3438) or (r)emote source (da5f5b1)? |
| 498 l | 498 l |
| 499 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 499 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 512 aa84837ccfbdfedcdcdeeedc309d73e6eb069edc | 512 aa84837ccfbdfedcdcdeeedc309d73e6eb069edc |
| 513 $ cd .. | 513 $ cd .. |
| 514 $ hg id -n | 514 $ hg id -n |
| 515 1+ | 515 1+ |
| 516 $ hg update 7 | 516 $ hg update 7 |
| 517 subrepository s diverged (local revision: 32a343883b74, remote revision: 32a343883b74) | 517 subrepository s diverged (local revision: 32a3438, remote revision: 32a3438) |
| 518 (M)erge, keep (l)ocal or keep (r)emote? m | 518 (M)erge, keep (l)ocal or keep (r)emote? m |
| 519 subrepository sources for s differ | 519 subrepository sources for s differ |
| 520 use (l)ocal source (32a3438) or (r)emote source (32a3438)? | 520 use (l)ocal source (32a3438) or (r)emote source (32a3438)? |
| 521 l | 521 l |
| 522 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 522 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |