Mercurial > hg
comparison tests/test-rebase-obsolete.t @ 26902:7ffebbdcb371
rebase: preserve the 'intermediate-source' attribute of grafts
Preserving the 'source' attribute of grafts started with a69a77a80900, which
predates the introduction of 'intermediate-source' in 51930a7180bd by a year and
a half. It looks like not preserving this was an oversight.
On a related note, notice how the source value of 32af76 is no longer visible in
the graph above this test. Is it reasonable to import the sha1 translation from
evolve.py:relocate() into scmutil or similar, and use that to fixup these
attributes as well as the commit message? (I realize that evolve is still
experimental, but I don't see a way to do this from the evolve extension.)
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sun, 08 Nov 2015 17:56:48 -0500 |
| parents | d1561a422748 |
| children | 53c668dc6b16 |
comparison
equal
deleted
inserted
replaced
| 26901:0e3d093c468e | 26902:7ffebbdcb371 |
|---|---|
| 241 user: Nicolas Dumazet <nicdumz.commits@gmail.com> | 241 user: Nicolas Dumazet <nicdumz.commits@gmail.com> |
| 242 date: Sat Apr 30 15:24:48 2011 +0200 | 242 date: Sat Apr 30 15:24:48 2011 +0200 |
| 243 files+: D | 243 files+: D |
| 244 extra: branch=default | 244 extra: branch=default |
| 245 extra: rebase_source=08483444fef91d6224f6655ee586a65d263ad34c | 245 extra: rebase_source=08483444fef91d6224f6655ee586a65d263ad34c |
| 246 extra: source=32af7686d403cf45b5d95f2d70cebea587ac806a | |
| 247 description: | |
| 248 D | |
| 249 | |
| 250 | |
| 251 $ hg up -qr 'desc(G)' | |
| 252 $ hg graft 4596109a6a4328c398bde3a4a3b6737cfade3003 | |
| 253 grafting 11:4596109a6a43 "D" | |
| 254 $ hg up -qr 'desc(E)' | |
| 255 $ hg rebase -s tip -d . | |
| 256 rebasing 14:9e36056a46e3 "D" (tip) | |
| 257 $ hg log --style default --debug -r tip | |
| 258 changeset: 15:627d4614809036ba22b9e7cb31638ddc06ab99ab | |
| 259 tag: tip | |
| 260 phase: draft | |
| 261 parent: 4:9520eea781bcca16c1e15acc0ba14335a0e8e5ba | |
| 262 parent: -1:0000000000000000000000000000000000000000 | |
| 263 manifest: 15:648e8ede73ae3e497d093d3a4c8fcc2daa864f42 | |
| 264 user: Nicolas Dumazet <nicdumz.commits@gmail.com> | |
| 265 date: Sat Apr 30 15:24:48 2011 +0200 | |
| 266 files+: D | |
| 267 extra: branch=default | |
| 268 extra: intermediate-source=4596109a6a4328c398bde3a4a3b6737cfade3003 | |
| 269 extra: rebase_source=9e36056a46e37c9776168c7375734eebc70e294f | |
| 246 extra: source=32af7686d403cf45b5d95f2d70cebea587ac806a | 270 extra: source=32af7686d403cf45b5d95f2d70cebea587ac806a |
| 247 description: | 271 description: |
| 248 D | 272 D |
| 249 | 273 |
| 250 | 274 |