Mercurial > hg
comparison tests/test-update-branches.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 | 7433b3bc55ee |
| children | 6d88468d435b |
comparison
equal
deleted
inserted
replaced
| 32697:19b9fc40cc51 | 32698:1b5c61d38a52 |
|---|---|
| 92 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 92 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 93 parent=5 | 93 parent=5 |
| 94 | 94 |
| 95 $ norevtest 'none clean same' clean 2 | 95 $ norevtest 'none clean same' clean 2 |
| 96 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 96 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 97 updated to "bd10386d478c: 2" | |
| 97 1 other heads for branch "default" | 98 1 other heads for branch "default" |
| 98 parent=2 | 99 parent=2 |
| 99 | 100 |
| 100 | 101 |
| 101 $ revtest 'none clean linear' clean 1 2 | 102 $ revtest 'none clean linear' clean 1 2 |
| 139 parent=3 | 140 parent=3 |
| 140 M foo | 141 M foo |
| 141 | 142 |
| 142 $ norevtest 'none dirty cross' dirty 2 | 143 $ norevtest 'none dirty cross' dirty 2 |
| 143 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 144 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 145 updated to "bd10386d478c: 2" | |
| 144 1 other heads for branch "default" | 146 1 other heads for branch "default" |
| 145 parent=2 | 147 parent=2 |
| 146 M foo | 148 M foo |
| 147 | 149 |
| 148 $ revtest 'none dirtysub cross' dirtysub 3 4 | 150 $ revtest 'none dirtysub cross' dirtysub 3 4 |
| 175 parent=1 | 177 parent=1 |
| 176 M sub/suba | 178 M sub/suba |
| 177 | 179 |
| 178 $ norevtest '-c clean same' clean 2 -c | 180 $ norevtest '-c clean same' clean 2 -c |
| 179 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 181 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 182 updated to "bd10386d478c: 2" | |
| 180 1 other heads for branch "default" | 183 1 other heads for branch "default" |
| 181 parent=2 | 184 parent=2 |
| 182 | 185 |
| 183 $ revtest '-cC dirty linear' dirty 1 2 -cC | 186 $ revtest '-cC dirty linear' dirty 1 2 -cC |
| 184 abort: can only specify one of -C/--clean, -c/--check, or -m/merge | 187 abort: can only specify one of -C/--clean, -c/--check, or -m/merge |