Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 27974:bb14a81ce647 stable
graft: don't preserve most extra fields
This backs out changeset 804abe8999f3.
See the previous patch for why we're doing this.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 03 Feb 2016 09:06:52 -0800 |
parents | ce9696193175 |
children | 96bfd2875213 e417e4512b0f |
line wrap: on
line diff
--- 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()