Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: don't preserve most extra fields stable
authorSiddharth Agarwal <sid0@fb.com>
Wed, 03 Feb 2016 09:06:52 -0800
branchstable
changeset 27974 bb14a81ce647
parent 27973 ce9696193175
child 27975 6f92d6bd2972
graft: don't preserve most extra fields This backs out changeset 804abe8999f3. See the previous patch for why we're doing this.
mercurial/commands.py file | annotate | diff | comparison | revisions
tests/test-rebase-obsolete.t file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Wed Feb 03 08:59:46 2016 -0800
+++ b/mercurial/commands.py	Wed Feb 03 09:06:52 2016 -0800
@@ -4010,10 +4010,10 @@
         if opts.get('dry_run'):
             continue
 
-        extra = ctx.extra().copy()
-        del extra['branch']
-        source = extra.get('source')
+        source = ctx.extra().get('source')
+        extra = {}
         if source:
+            extra['source'] = source
             extra['intermediate-source'] = ctx.hex()
         else:
             extra['source'] = ctx.hex()
--- a/tests/test-rebase-obsolete.t	Wed Feb 03 08:59:46 2016 -0800
+++ b/tests/test-rebase-obsolete.t	Wed Feb 03 09:06:52 2016 -0800
@@ -253,9 +253,9 @@
   grafting 11:4596109a6a43 "D"
   $ hg up -qr 'desc(E)'
   $ hg rebase -s tip -d .
-  rebasing 14:0f4c66d0b70f "D" (tip)
+  rebasing 14:9e36056a46e3 "D" (tip)
   $ hg log --style default --debug -r tip
-  changeset:   15:884f358981b4d32069bb539e0e95d49a35eb81d0
+  changeset:   15:627d4614809036ba22b9e7cb31638ddc06ab99ab
   tag:         tip
   phase:       draft
   parent:      4:9520eea781bcca16c1e15acc0ba14335a0e8e5ba
@@ -266,7 +266,7 @@
   files+:      D
   extra:       branch=default
   extra:       intermediate-source=4596109a6a4328c398bde3a4a3b6737cfade3003
-  extra:       rebase_source=0f4c66d0b70f8e1ce4aec01f8e95cf24ee923afa
+  extra:       rebase_source=9e36056a46e37c9776168c7375734eebc70e294f
   extra:       source=32af7686d403cf45b5d95f2d70cebea587ac806a
   description:
   D
mercurial