Mercurial > evolve
comparison tests/test-evolve-issue5966.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 | b6c819facbe8 |
| children | b3d9e6c805d6 |
comparison
equal
deleted
inserted
replaced
| 5690:35b0f8f45250 | 5691:6eb9f82b43ba |
|---|---|
| 90 continue: hg evolve --continue | 90 continue: hg evolve --continue |
| 91 $ hg resolve --list | 91 $ hg resolve --list |
| 92 R a | 92 R a |
| 93 $ hg evolve --continue | 93 $ hg evolve --continue |
| 94 evolving 2:34a690fcf6ab "banana" | 94 evolving 2:34a690fcf6ab "banana" |
| 95 working directory is now at 581a2bb4704c | |
| 96 $ hg resolve --list | 95 $ hg resolve --list |
| 97 | 96 |
| 98 evolve the rest of the stack | 97 evolve the rest of the stack |
| 99 | 98 |
| 100 $ hg evolve | 99 $ hg evolve |