Mercurial > evolve
comparison tests/test-evolve-public-content-divergent-discard.t @ 5691:6eb9f82b43ba stable
evolve: remove spurious "working directory is now at ..." messages
The `startnode` variable was sometimes a context, which made the
comparison with `repo[b'.'].node()` in `_cleanup()` fail. This patch
fixes that by making sure that `startnode` is always a (binary)
nodeid.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 24 Nov 2020 18:04:40 -0800 |
| parents | eb326644dc29 |
| children | b3d9e6c805d6 |
comparison
equal
deleted
inserted
replaced
| 5690:35b0f8f45250 | 5691:6eb9f82b43ba |
|---|---|
| 291 (no more unresolved files) | 291 (no more unresolved files) |
| 292 continue: hg evolve --continue | 292 continue: hg evolve --continue |
| 293 | 293 |
| 294 $ hg evolve --continue | 294 $ hg evolve --continue |
| 295 other divergent changeset 229da2719b19 has same content as local f7c1071f1e7c and differs by "description" only, discarding 229da2719b19 | 295 other divergent changeset 229da2719b19 has same content as local f7c1071f1e7c and differs by "description" only, discarding 229da2719b19 |
| 296 working directory is now at f7c1071f1e7c | |
| 297 | 296 |
| 298 $ hg evolve -l | 297 $ hg evolve -l |
| 299 | 298 |
| 300 $ hg par | 299 $ hg par |
| 301 changeset: 4:f7c1071f1e7c | 300 changeset: 4:f7c1071f1e7c |
| 397 | 396 |
| 398 $ hg evolve --continue | 397 $ hg evolve --continue |
| 399 evolving 4:f89a8e2f86ac "added dh" | 398 evolving 4:f89a8e2f86ac "added dh" |
| 400 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 399 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 401 other divergent changeset bc309da55b88 has same content as local e800202333a4 and differs by "description" only, discarding bc309da55b88 | 400 other divergent changeset bc309da55b88 has same content as local e800202333a4 and differs by "description" only, discarding bc309da55b88 |
| 402 working directory is now at e800202333a4 | |
| 403 | 401 |
| 404 $ hg evolve -l | 402 $ hg evolve -l |
| 405 | 403 |
| 406 $ hg par | 404 $ hg par |
| 407 changeset: 5:e800202333a4 | 405 changeset: 5:e800202333a4 |
| 501 (no more unresolved files) | 499 (no more unresolved files) |
| 502 continue: hg evolve --continue | 500 continue: hg evolve --continue |
| 503 | 501 |
| 504 $ hg evolve --continue | 502 $ hg evolve --continue |
| 505 other divergent changeset a5bbf2042450 has same content as local e800202333a4 and differs by "description" only, discarding a5bbf2042450 | 503 other divergent changeset a5bbf2042450 has same content as local e800202333a4 and differs by "description" only, discarding a5bbf2042450 |
| 506 working directory is now at e800202333a4 | |
| 507 | 504 |
| 508 $ hg evolve -l | 505 $ hg evolve -l |
| 509 | 506 |
| 510 $ hg par | 507 $ hg par |
| 511 changeset: 5:e800202333a4 | 508 changeset: 5:e800202333a4 |
| 619 (no more unresolved files) | 616 (no more unresolved files) |
| 620 continue: hg evolve --continue | 617 continue: hg evolve --continue |
| 621 | 618 |
| 622 $ hg evolve --continue | 619 $ hg evolve --continue |
| 623 other divergent changeset 09054d1f3c97 has same content as local e800202333a4 and differs by "description" only, discarding 09054d1f3c97 | 620 other divergent changeset 09054d1f3c97 has same content as local e800202333a4 and differs by "description" only, discarding 09054d1f3c97 |
| 624 working directory is now at e800202333a4 | |
| 625 | 621 |
| 626 $ hg evolve -l | 622 $ hg evolve -l |
| 627 | 623 |
| 628 $ hg par | 624 $ hg par |
| 629 changeset: 5:e800202333a4 | 625 changeset: 5:e800202333a4 |