Show More
@@ -4010,10 +4010,10 b' def _dograft(ui, repo, *revs, **opts):' | |||
|
4010 | 4010 | if opts.get('dry_run'): |
|
4011 | 4011 | continue |
|
4012 | 4012 | |
|
4013 |
e |
|
|
4014 | del extra['branch'] | |
|
4015 | source = extra.get('source') | |
|
4013 | source = ctx.extra().get('source') | |
|
4014 | extra = {} | |
|
4016 | 4015 | if source: |
|
4016 | extra['source'] = source | |
|
4017 | 4017 | extra['intermediate-source'] = ctx.hex() |
|
4018 | 4018 | else: |
|
4019 | 4019 | extra['source'] = ctx.hex() |
@@ -253,9 +253,9 b' More complex case were part of the rebas' | |||
|
253 | 253 | grafting 11:4596109a6a43 "D" |
|
254 | 254 | $ hg up -qr 'desc(E)' |
|
255 | 255 | $ hg rebase -s tip -d . |
|
256 |
rebasing 14: |
|
|
256 | rebasing 14:9e36056a46e3 "D" (tip) | |
|
257 | 257 | $ hg log --style default --debug -r tip |
|
258 | changeset: 15:884f358981b4d32069bb539e0e95d49a35eb81d0 | |
|
258 | changeset: 15:627d4614809036ba22b9e7cb31638ddc06ab99ab | |
|
259 | 259 | tag: tip |
|
260 | 260 | phase: draft |
|
261 | 261 | parent: 4:9520eea781bcca16c1e15acc0ba14335a0e8e5ba |
@@ -266,7 +266,7 b' More complex case were part of the rebas' | |||
|
266 | 266 | files+: D |
|
267 | 267 | extra: branch=default |
|
268 | 268 | extra: intermediate-source=4596109a6a4328c398bde3a4a3b6737cfade3003 |
|
269 | extra: rebase_source=0f4c66d0b70f8e1ce4aec01f8e95cf24ee923afa | |
|
269 | extra: rebase_source=9e36056a46e37c9776168c7375734eebc70e294f | |
|
270 | 270 | extra: source=32af7686d403cf45b5d95f2d70cebea587ac806a |
|
271 | 271 | description: |
|
272 | 272 | D |
General Comments 0
You need to be logged in to leave comments.
Login now