Mercurial > hg
comparison tests/test-pull-update.t @ 34661:eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Upon pull or unbundle, we display a message with the range of new revisions
fetched. This revision range could readily be used after a pull to look out
what's new with 'hg log'. The algorithm takes care of filtering "obsolete"
revisions that might be present in transaction's "changes" but should not be
displayed to the end user.
| author | Denis Laxalde <denis.laxalde@logilab.fr> |
|---|---|
| date | Thu, 12 Oct 2017 09:39:50 +0200 |
| parents | 1b5c61d38a52 |
| children | 23ed47a895d5 |
comparison
equal
deleted
inserted
replaced
| 34660:d00ec62d156f | 34661:eb586ed5d8ce |
|---|---|
| 24 searching for changes | 24 searching for changes |
| 25 adding changesets | 25 adding changesets |
| 26 adding manifests | 26 adding manifests |
| 27 adding file changes | 27 adding file changes |
| 28 added 1 changesets with 1 changes to 1 files (+1 heads) | 28 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 29 new changesets 107cefe13e42 | |
| 29 abort: uncommitted changes | 30 abort: uncommitted changes |
| 30 [255] | 31 [255] |
| 31 $ hg --config extensions.strip= strip --no-backup tip | 32 $ hg --config extensions.strip= strip --no-backup tip |
| 32 $ hg co -qC tip | 33 $ hg co -qC tip |
| 33 | 34 |
| 38 searching for changes | 39 searching for changes |
| 39 adding changesets | 40 adding changesets |
| 40 adding manifests | 41 adding manifests |
| 41 adding file changes | 42 adding file changes |
| 42 added 1 changesets with 1 changes to 1 files (+1 heads) | 43 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 44 new changesets 107cefe13e42 | |
| 43 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 45 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 44 updated to "800c91d5bfc1: m" | 46 updated to "800c91d5bfc1: m" |
| 45 1 other heads for branch "default" | 47 1 other heads for branch "default" |
| 46 | 48 |
| 47 $ cd ../tt | 49 $ cd ../tt |
| 53 searching for changes | 55 searching for changes |
| 54 adding changesets | 56 adding changesets |
| 55 adding manifests | 57 adding manifests |
| 56 adding file changes | 58 adding file changes |
| 57 added 1 changesets with 1 changes to 1 files (+1 heads) | 59 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 60 new changesets 800c91d5bfc1 | |
| 58 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 61 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 59 updated to "107cefe13e42: m" | 62 updated to "107cefe13e42: m" |
| 60 1 other heads for branch "default" | 63 1 other heads for branch "default" |
| 61 | 64 |
| 62 $ HGMERGE=true hg merge | 65 $ HGMERGE=true hg merge |
| 74 searching for changes | 77 searching for changes |
| 75 adding changesets | 78 adding changesets |
| 76 adding manifests | 79 adding manifests |
| 77 adding file changes | 80 adding file changes |
| 78 added 1 changesets with 1 changes to 1 files (-1 heads) | 81 added 1 changesets with 1 changes to 1 files (-1 heads) |
| 82 new changesets 483b76ad4309 | |
| 79 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 83 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 80 | 84 |
| 81 Similarity between "hg update" and "hg pull -u" in handling bookmark | 85 Similarity between "hg update" and "hg pull -u" in handling bookmark |
| 82 ==================================================================== | 86 ==================================================================== |
| 83 | 87 |
| 101 adding changesets | 105 adding changesets |
| 102 adding manifests | 106 adding manifests |
| 103 adding file changes | 107 adding file changes |
| 104 added 1 changesets with 1 changes to 1 files | 108 added 1 changesets with 1 changes to 1 files |
| 105 adding remote bookmark active-after-pull | 109 adding remote bookmark active-after-pull |
| 110 new changesets f815b3da6163 | |
| 106 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 111 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 107 (activating bookmark active-after-pull) | 112 (activating bookmark active-after-pull) |
| 108 | 113 |
| 109 $ hg parents -q | 114 $ hg parents -q |
| 110 4:f815b3da6163 | 115 4:f815b3da6163 |
| 129 adding changesets | 134 adding changesets |
| 130 adding manifests | 135 adding manifests |
| 131 adding file changes | 136 adding file changes |
| 132 added 1 changesets with 1 changes to 1 files | 137 added 1 changesets with 1 changes to 1 files |
| 133 adding remote bookmark active-after-pull | 138 adding remote bookmark active-after-pull |
| 139 new changesets f815b3da6163 | |
| 134 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 140 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 135 (activating bookmark active-after-pull) | 141 (activating bookmark active-after-pull) |
| 136 | 142 |
| 137 $ hg parents -q | 143 $ hg parents -q |
| 138 4:f815b3da6163 | 144 4:f815b3da6163 |
| 166 searching for changes | 172 searching for changes |
| 167 adding changesets | 173 adding changesets |
| 168 adding manifests | 174 adding manifests |
| 169 adding file changes | 175 adding file changes |
| 170 added 2 changesets with 1 changes to 1 files | 176 added 2 changesets with 1 changes to 1 files |
| 177 new changesets f815b3da6163:b5e4babfaaa7 | |
| 171 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 178 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 172 (leaving bookmark active-before-pull) | 179 (leaving bookmark active-before-pull) |
| 173 | 180 |
| 174 $ hg parents -q | 181 $ hg parents -q |
| 175 5:b5e4babfaaa7 | 182 5:b5e4babfaaa7 |
| 192 searching for changes | 199 searching for changes |
| 193 adding changesets | 200 adding changesets |
| 194 adding manifests | 201 adding manifests |
| 195 adding file changes | 202 adding file changes |
| 196 added 2 changesets with 1 changes to 1 files | 203 added 2 changesets with 1 changes to 1 files |
| 204 new changesets f815b3da6163:b5e4babfaaa7 | |
| 197 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 205 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 198 (leaving bookmark active-before-pull) | 206 (leaving bookmark active-before-pull) |
| 199 | 207 |
| 200 $ hg parents -q | 208 $ hg parents -q |
| 201 5:b5e4babfaaa7 | 209 5:b5e4babfaaa7 |
| 218 searching for changes | 226 searching for changes |
| 219 adding changesets | 227 adding changesets |
| 220 adding manifests | 228 adding manifests |
| 221 adding file changes | 229 adding file changes |
| 222 added 2 changesets with 1 changes to 1 files | 230 added 2 changesets with 1 changes to 1 files |
| 231 new changesets f815b3da6163:b5e4babfaaa7 | |
| 223 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 232 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 224 (leaving bookmark active-before-pull) | 233 (leaving bookmark active-before-pull) |
| 225 | 234 |
| 226 $ hg parents -q | 235 $ hg parents -q |
| 227 5:b5e4babfaaa7 | 236 5:b5e4babfaaa7 |