Mercurial > evolve
comparison tests/test-evolve-abort-phasediv.t @ 6316:b1d1f4ade142
evolve: don't embed graft data when completing interrupted evolve operations
This data shows in TortoiseHg, and is a bit awkward since it wasn't added before
in the non interrupted case. It originated before 823031b51d81, when the
implementation changed away from using the graft command. According to
@marmoute, unconditionally adding `source` served as noise to create a new hash
and prevent a cycle, so use the same key (`rebase_source`) as would happen in
the uninterrupted case (as demonstrated by the first change in
test-stabilize-conflict.t).
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Fri, 07 Oct 2022 18:14:58 -0400 |
| parents | 1cbafebe874b |
| children | 1328195f76a9 |
comparison
equal
deleted
inserted
replaced
| 6314:3bad2060db25 | 6316:b1d1f4ade142 |
|---|---|
| 300 $ hg resolve -m | 300 $ hg resolve -m |
| 301 (no more unresolved files) | 301 (no more unresolved files) |
| 302 continue: hg evolve --continue | 302 continue: hg evolve --continue |
| 303 $ hg evolve --continue | 303 $ hg evolve --continue |
| 304 evolving 9:28cd06b3f801 "added c" | 304 evolving 9:28cd06b3f801 "added c" |
| 305 committed as 95d746965290 | 305 committed as 92acf49069a4 |
| 306 recreate:[10] added d | 306 recreate:[10] added d |
| 307 atop:[4] added d | 307 atop:[4] added d |
| 308 rebasing to destination parent: ca1b80f7960a | 308 rebasing to destination parent: ca1b80f7960a |
| 309 merging c | 309 merging c |
| 310 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 310 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |