Mercurial > hg
comparison tests/test-largefiles-update.t @ 32698:1b5c61d38a52
update: show the commit to which we updated in case of multiple heads (BC)
Currently when we have multiple heads on the same branch, update tells us that
there some more heads for the current branch but does not tells us the head to
which the repository has been updated to. It makes more sense showing the
head we updated to and then telling there are some more heads.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Tue, 06 Jun 2017 22:17:39 +0530 |
| parents | 2d6b86cadc10 |
| children | 1e872b08a4e9 |
comparison
equal
deleted
inserted
replaced
| 32697:19b9fc40cc51 | 32698:1b5c61d38a52 |
|---|---|
| 69 Verify that it actually marks the clean files as clean in lfdirstate so | 69 Verify that it actually marks the clean files as clean in lfdirstate so |
| 70 we don't have to hash them again next time we update. | 70 we don't have to hash them again next time we update. |
| 71 | 71 |
| 72 $ hg up | 72 $ hg up |
| 73 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 73 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 74 updated to "f74e50bd9e55: #2" | |
| 74 1 other heads for branch "default" | 75 1 other heads for branch "default" |
| 75 $ hg debugdirstate --large --nodate | 76 $ hg debugdirstate --large --nodate |
| 76 n 644 7 set large1 | 77 n 644 7 set large1 |
| 77 n 644 13 set large2 | 78 n 644 13 set large2 |
| 78 | 79 |
| 84 $ hg debugdirstate --large --nodate | 85 $ hg debugdirstate --large --nodate |
| 85 n 644 7 set large1 | 86 n 644 7 set large1 |
| 86 n 644 13 set large2 | 87 n 644 13 set large2 |
| 87 $ hg up | 88 $ hg up |
| 88 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 89 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 90 updated to "f74e50bd9e55: #2" | |
| 89 1 other heads for branch "default" | 91 1 other heads for branch "default" |
| 90 $ hg debugdirstate --large --nodate | 92 $ hg debugdirstate --large --nodate |
| 91 n 644 7 set large1 | 93 n 644 7 set large1 |
| 92 n 644 13 set large2 | 94 n 644 13 set large2 |
| 93 | 95 |
| 469 largefile large1 has a merge conflict | 471 largefile large1 has a merge conflict |
| 470 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 | 472 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
| 471 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or | 473 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or |
| 472 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l | 474 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l |
| 473 2 files updated, 1 files merged, 0 files removed, 0 files unresolved | 475 2 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 476 updated to "d65e59e952a9: #5" | |
| 474 1 other heads for branch "default" | 477 1 other heads for branch "default" |
| 475 | 478 |
| 476 $ hg status -A large1 | 479 $ hg status -A large1 |
| 477 M large1 | 480 M large1 |
| 478 $ cat large1 | 481 $ cat large1 |
| 503 largefile large1 has a merge conflict | 506 largefile large1 has a merge conflict |
| 504 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 | 507 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
| 505 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or | 508 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or |
| 506 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l | 509 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l |
| 507 2 files updated, 1 files merged, 0 files removed, 0 files unresolved | 510 2 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 511 updated to "d65e59e952a9: #5" | |
| 508 1 other heads for branch "default" | 512 1 other heads for branch "default" |
| 509 | 513 |
| 510 $ hg status -A large1 | 514 $ hg status -A large1 |
| 511 M large1 | 515 M large1 |
| 512 $ cat large1 | 516 $ cat large1 |