Mercurial > hg
comparison tests/test-fetch.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 | 9dcc9ed26d33 |
| children | 5c2a4f37eace |
comparison
equal
deleted
inserted
replaced
| 34660:d00ec62d156f | 34661:eb586ed5d8ce |
|---|---|
| 28 searching for changes | 28 searching for changes |
| 29 adding changesets | 29 adding changesets |
| 30 adding manifests | 30 adding manifests |
| 31 adding file changes | 31 adding file changes |
| 32 added 1 changesets with 1 changes to 1 files | 32 added 1 changesets with 1 changes to 1 files |
| 33 new changesets d2ae7f538514 | |
| 33 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 34 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 34 $ hg --cwd b parents -q | 35 $ hg --cwd b parents -q |
| 35 1:d2ae7f538514 | 36 1:d2ae7f538514 |
| 36 $ echo c > c/c | 37 $ echo c > c/c |
| 37 $ hg --cwd c commit -Amc | 38 $ hg --cwd c commit -Amc |
| 53 searching for changes | 54 searching for changes |
| 54 adding changesets | 55 adding changesets |
| 55 adding manifests | 56 adding manifests |
| 56 adding file changes | 57 adding file changes |
| 57 added 1 changesets with 1 changes to 1 files (+1 heads) | 58 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 59 new changesets d2ae7f538514 | |
| 58 updating to 2:d2ae7f538514 | 60 updating to 2:d2ae7f538514 |
| 59 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 61 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 60 merging with 1:d36c0562f908 | 62 merging with 1:d36c0562f908 |
| 61 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 63 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 62 new changeset 3:a323a0c43ec4 merges remote changes with local | 64 new changeset 3:a323a0c43ec4 merges remote changes with local |
| 75 searching for changes | 77 searching for changes |
| 76 adding changesets | 78 adding changesets |
| 77 adding manifests | 79 adding manifests |
| 78 adding file changes | 80 adding file changes |
| 79 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 d2ae7f538514 | |
| 80 updating to 2:d2ae7f538514 | 83 updating to 2:d2ae7f538514 |
| 81 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 84 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 82 merging with 1:d36c0562f908 | 85 merging with 1:d36c0562f908 |
| 83 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 86 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 84 Automated merge with http://localhost:$HGPORT/ | 87 Automated merge with http://localhost:$HGPORT/ |
| 108 searching for changes | 111 searching for changes |
| 109 adding changesets | 112 adding changesets |
| 110 adding manifests | 113 adding manifests |
| 111 adding file changes | 114 adding file changes |
| 112 added 1 changesets with 1 changes to 1 files (+1 heads) | 115 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 116 new changesets d2ae7f538514 | |
| 113 updating to 2:d2ae7f538514 | 117 updating to 2:d2ae7f538514 |
| 114 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 118 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 115 merging with 1:d36c0562f908 | 119 merging with 1:d36c0562f908 |
| 116 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 120 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 117 new changeset 3:* merges remote changes with local (glob) | 121 new changeset 3:* merges remote changes with local (glob) |
| 139 searching for changes | 143 searching for changes |
| 140 adding changesets | 144 adding changesets |
| 141 adding manifests | 145 adding manifests |
| 142 adding file changes | 146 adding file changes |
| 143 added 1 changesets with 1 changes to 1 files (+1 heads) | 147 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 148 new changesets 6343ca3eff20 | |
| 144 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 149 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 145 merging with 3:6343ca3eff20 | 150 merging with 3:6343ca3eff20 |
| 146 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 151 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 147 new changeset 4:f7faa0b7d3c6 merges remote changes with local | 152 new changeset 4:f7faa0b7d3c6 merges remote changes with local |
| 148 $ rm i/g | 153 $ rm i/g |
| 191 searching for changes | 196 searching for changes |
| 192 adding changesets | 197 adding changesets |
| 193 adding manifests | 198 adding manifests |
| 194 adding file changes | 199 adding file changes |
| 195 added 1 changesets with 1 changes to 1 files | 200 added 1 changesets with 1 changes to 1 files |
| 201 new changesets 8fdc9284bbc5 | |
| 196 | 202 |
| 197 parent should be 2 (no automatic update) | 203 parent should be 2 (no automatic update) |
| 198 | 204 |
| 199 $ hg -R n2 parents --template '{rev}\n' | 205 $ hg -R n2 parents --template '{rev}\n' |
| 200 2 | 206 2 |
| 223 searching for changes | 229 searching for changes |
| 224 adding changesets | 230 adding changesets |
| 225 adding manifests | 231 adding manifests |
| 226 adding file changes | 232 adding file changes |
| 227 added 2 changesets with 2 changes to 2 files | 233 added 2 changesets with 2 changes to 2 files |
| 234 new changesets 8fdc9284bbc5:3c4a837a864f | |
| 228 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 235 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 229 | 236 |
| 230 parent should be 4 (fast forward) | 237 parent should be 4 (fast forward) |
| 231 | 238 |
| 232 $ hg -R n2 parents --template '{rev}\n' | 239 $ hg -R n2 parents --template '{rev}\n' |
| 265 searching for changes | 272 searching for changes |
| 266 adding changesets | 273 adding changesets |
| 267 adding manifests | 274 adding manifests |
| 268 adding file changes | 275 adding file changes |
| 269 added 3 changesets with 3 changes to 2 files (+2 heads) | 276 added 3 changesets with 3 changes to 2 files (+2 heads) |
| 277 new changesets d05ce59ff88d:a7954de24e4c | |
| 270 updating to 5:3c4a837a864f | 278 updating to 5:3c4a837a864f |
| 271 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 279 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 272 merging with 3:1267f84a9ea5 | 280 merging with 3:1267f84a9ea5 |
| 273 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 281 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 274 new changeset 7:2cf2a1261f21 merges remote changes with local | 282 new changeset 7:2cf2a1261f21 merges remote changes with local |
| 312 searching for changes | 320 searching for changes |
| 313 adding changesets | 321 adding changesets |
| 314 adding manifests | 322 adding manifests |
| 315 adding file changes | 323 adding file changes |
| 316 added 3 changesets with 2 changes to 1 files (+2 heads) | 324 added 3 changesets with 2 changes to 1 files (+2 heads) |
| 325 new changesets b84e8d0f020f:3d3bf54f99c0 | |
| 317 not merging with 1 other new branch heads (use "hg heads ." and "hg merge" to merge them) | 326 not merging with 1 other new branch heads (use "hg heads ." and "hg merge" to merge them) |
| 318 [1] | 327 [1] |
| 319 | 328 |
| 320 parent should be 3 (fetch did not merge anything) | 329 parent should be 3 (fetch did not merge anything) |
| 321 | 330 |
| 396 searching for changes | 405 searching for changes |
| 397 adding changesets | 406 adding changesets |
| 398 adding manifests | 407 adding manifests |
| 399 adding file changes | 408 adding file changes |
| 400 added 1 changesets with 1 changes to 1 files (+1 heads) | 409 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 410 new changesets 7837755a2789 | |
| 401 updating to 2:7837755a2789 | 411 updating to 2:7837755a2789 |
| 402 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 412 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 403 merging with 1:d1f0c6c48ebd | 413 merging with 1:d1f0c6c48ebd |
| 404 merging a | 414 merging a |
| 405 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 415 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 424 searching for changes | 434 searching for changes |
| 425 adding changesets | 435 adding changesets |
| 426 adding manifests | 436 adding manifests |
| 427 adding file changes | 437 adding file changes |
| 428 added 1 changesets with 1 changes to 1 files | 438 added 1 changesets with 1 changes to 1 files |
| 439 new changesets c8735224de5c | |
| 429 | 440 |
| 430 $ cd .. | 441 $ cd .. |