Mercurial > evolve
comparison tests/test-stabilize-conflict.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 | a1dad44fe3da |
| children | 1328195f76a9 |
comparison
equal
deleted
inserted
replaced
| 6314:3bad2060db25 | 6316:b1d1f4ade142 |
|---|---|
| 78 $ hg evolve --update | 78 $ hg evolve --update |
| 79 move:[2] babar count up to fifteen | 79 move:[2] babar count up to fifteen |
| 80 atop:[3] babar count up to ten | 80 atop:[3] babar count up to ten |
| 81 merging babar | 81 merging babar |
| 82 working directory is now at 71c18f70c34f | 82 working directory is now at 71c18f70c34f |
| 83 | |
| 84 $ hg log -r . -T '{extras % "{key}={value}\n"}' | |
| 85 branch=default | |
| 86 rebase_source=694f05b30ab7d4324e469d19af2ee80003a8fb50 | |
| 87 | |
| 83 $ hg resolve -l | 88 $ hg resolve -l |
| 84 $ hg log -G | 89 $ hg log -G |
| 85 @ changeset: 4:71c18f70c34f | 90 @ changeset: 4:71c18f70c34f |
| 86 | tag: tip | 91 | tag: tip |
| 87 | user: test | 92 | user: test |
| 165 $ hg resolve --all -m | 170 $ hg resolve --all -m |
| 166 (no more unresolved files) | 171 (no more unresolved files) |
| 167 continue: hg evolve --continue | 172 continue: hg evolve --continue |
| 168 $ hg evolve --continue | 173 $ hg evolve --continue |
| 169 evolving 4:71c18f70c34f "babar count up to fifteen" | 174 evolving 4:71c18f70c34f "babar count up to fifteen" |
| 170 working directory is now at 1836b91c6c1d | 175 working directory is now at 368da14a3c59 |
| 171 $ hg resolve -l | 176 |
| 172 $ hg log -G | 177 $ hg log -r . -T '{extras % "{key}={value}\n"}' |
| 173 @ changeset: 6:1836b91c6c1d | 178 branch=default |
| 179 rebase_source=71c18f70c34f7a15e293983a89ccd17ae3f444aa | |
| 180 | |
| 181 $ hg resolve -l | |
| 182 $ hg log -G | |
| 183 @ changeset: 6:368da14a3c59 | |
| 174 | tag: tip | 184 | tag: tip |
| 175 | user: test | 185 | user: test |
| 176 | date: Thu Jan 01 00:00:00 1970 +0000 | 186 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 177 | summary: babar count up to fifteen | 187 | summary: babar count up to fifteen |
| 178 | | 188 | |
| 230 | parent: 0:29ec1554cfaf | 240 | parent: 0:29ec1554cfaf |
| 231 | user: test | 241 | user: test |
| 232 | date: Thu Jan 01 00:00:00 1970 +0000 | 242 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 233 | summary: babar count up to ten | 243 | summary: babar count up to ten |
| 234 | | 244 | |
| 235 | % changeset: 6:1836b91c6c1d | 245 | % changeset: 6:368da14a3c59 |
| 236 | | user: test | 246 | | user: test |
| 237 | | date: Thu Jan 01 00:00:00 1970 +0000 | 247 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 238 | | instability: orphan | 248 | | instability: orphan |
| 239 | | summary: babar count up to fifteen | 249 | | summary: babar count up to fifteen |
| 240 | | | 250 | | |