##// END OF EJS Templates
graft: copy extra (except branch) when copying changesets
Mike Edgar -
r27147:804abe89 default
parent child Browse files
Show More
@@ -3831,10 +3831,10 b' def graft(ui, repo, *revs, **opts):'
3831 if opts.get('dry_run'):
3831 if opts.get('dry_run'):
3832 continue
3832 continue
3833
3833
3834 source = ctx.extra().get('source')
3834 extra = ctx.extra().copy()
3835 extra = {}
3835 del extra['branch']
3836 source = extra.get('source')
3836 if source:
3837 if source:
3837 extra['source'] = source
3838 extra['intermediate-source'] = ctx.hex()
3838 extra['intermediate-source'] = ctx.hex()
3839 else:
3839 else:
3840 extra['source'] = ctx.hex()
3840 extra['source'] = ctx.hex()
@@ -253,9 +253,9 b' More complex case were part of the rebas'
253 grafting 11:4596109a6a43 "D"
253 grafting 11:4596109a6a43 "D"
254 $ hg up -qr 'desc(E)'
254 $ hg up -qr 'desc(E)'
255 $ hg rebase -s tip -d .
255 $ hg rebase -s tip -d .
256 rebasing 14:9e36056a46e3 "D" (tip)
256 rebasing 14:0f4c66d0b70f "D" (tip)
257 $ hg log --style default --debug -r tip
257 $ hg log --style default --debug -r tip
258 changeset: 15:627d4614809036ba22b9e7cb31638ddc06ab99ab
258 changeset: 15:884f358981b4d32069bb539e0e95d49a35eb81d0
259 tag: tip
259 tag: tip
260 phase: draft
260 phase: draft
261 parent: 4:9520eea781bcca16c1e15acc0ba14335a0e8e5ba
261 parent: 4:9520eea781bcca16c1e15acc0ba14335a0e8e5ba
@@ -266,7 +266,7 b' More complex case were part of the rebas'
266 files+: D
266 files+: D
267 extra: branch=default
267 extra: branch=default
268 extra: intermediate-source=4596109a6a4328c398bde3a4a3b6737cfade3003
268 extra: intermediate-source=4596109a6a4328c398bde3a4a3b6737cfade3003
269 extra: rebase_source=9e36056a46e37c9776168c7375734eebc70e294f
269 extra: rebase_source=0f4c66d0b70f8e1ce4aec01f8e95cf24ee923afa
270 extra: source=32af7686d403cf45b5d95f2d70cebea587ac806a
270 extra: source=32af7686d403cf45b5d95f2d70cebea587ac806a
271 description:
271 description:
272 D
272 D
General Comments 0
You need to be logged in to leave comments. Login now