Mercurial > hg
comparison tests/test-blackbox.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 | 2b6692df1bdf |
| children | 75be14993fda |
comparison
equal
deleted
inserted
replaced
| 32697:19b9fc40cc51 | 32698:1b5c61d38a52 |
|---|---|
| 135 $ echo '[hooks]' >> .hg/hgrc | 135 $ echo '[hooks]' >> .hg/hgrc |
| 136 $ echo 'update = echo hooked' >> .hg/hgrc | 136 $ echo 'update = echo hooked' >> .hg/hgrc |
| 137 $ hg update | 137 $ hg update |
| 138 hooked | 138 hooked |
| 139 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 139 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 140 updated to "d02f48003e62: c" | |
| 140 1 other heads for branch "default" | 141 1 other heads for branch "default" |
| 141 $ hg blackbox -l 6 | 142 $ hg blackbox -l 6 |
| 142 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> update | 143 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> update |
| 143 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> writing .hg/cache/tags2-visible with 0 tags | 144 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> writing .hg/cache/tags2-visible with 0 tags |
| 144 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> pythonhook-preupdate: hgext.eol.preupdate finished in * seconds (glob) | 145 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> pythonhook-preupdate: hgext.eol.preupdate finished in * seconds (glob) |