Mercurial > hg
comparison tests/test-subrepo-git.t @ 13428:5ef29e0dd418 stable
subrepos: print short git changeset ids
This changes the prompts on git subrepos to show only the first seven
digits of git changeset IDs (as git's command line does):
$ hg update
subrepository sources for s differ (in checked out version)
use (l)ocal source (32a3438) or (r)emote source (da5f5b1)?
| author | Kevin Bullock <kbullock@ringworld.org> |
|---|---|
| date | Wed, 16 Feb 2011 11:53:48 -0600 |
| parents | 0748e18be470 |
| children | 64bb8e586a92 |
comparison
equal
deleted
inserted
replaced
| 13427:2432b3227303 | 13428:5ef29e0dd418 |
|---|---|
| 357 $ git rev-parse HEAD | 357 $ git rev-parse HEAD |
| 358 da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 | 358 da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
| 359 $ cd .. | 359 $ cd .. |
| 360 $ hg update 4 | 360 $ hg update 4 |
| 361 subrepository sources for s differ | 361 subrepository sources for s differ |
| 362 use (l)ocal source (da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7) or (r)emote source (aa84837ccfbdfedcdcdeeedc309d73e6eb069edc)? | 362 use (l)ocal source (da5f5b1) or (r)emote source (aa84837)? |
| 363 l | 363 l |
| 364 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 364 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 365 $ hg id -n | 365 $ hg id -n |
| 366 4+ | 366 4+ |
| 367 $ cd s | 367 $ cd s |
| 382 Previous HEAD position was 32a3438... fff | 382 Previous HEAD position was 32a3438... fff |
| 383 HEAD is now at aa84837... f | 383 HEAD is now at aa84837... f |
| 384 $ cd .. | 384 $ cd .. |
| 385 $ hg update 1 | 385 $ hg update 1 |
| 386 subrepository sources for s differ (in checked out version) | 386 subrepository sources for s differ (in checked out version) |
| 387 use (l)ocal source (32a343883b74769118bb1d3b4b1fbf9156f4dddc) or (r)emote source (da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7)? | 387 use (l)ocal source (32a3438) or (r)emote source (da5f5b1)? |
| 388 l | 388 l |
| 389 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 389 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 390 $ hg id -n | 390 $ hg id -n |
| 391 1+ | 391 1+ |
| 392 $ cd s | 392 $ cd s |
| 403 $ cd .. | 403 $ cd .. |
| 404 $ hg id -n | 404 $ hg id -n |
| 405 1+ | 405 1+ |
| 406 $ hg update 7 | 406 $ hg update 7 |
| 407 subrepository sources for s differ | 407 subrepository sources for s differ |
| 408 use (l)ocal source (32a343883b74769118bb1d3b4b1fbf9156f4dddc) or (r)emote source (32a343883b74769118bb1d3b4b1fbf9156f4dddc)? | 408 use (l)ocal source (32a3438) or (r)emote source (32a3438)? |
| 409 l | 409 l |
| 410 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 410 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 411 $ hg id -n | 411 $ hg id -n |
| 412 7 | 412 7 |
| 413 $ cd s | 413 $ cd s |