diff hgext/shelve.py @ 22147:9ac98c2aa95c stable

histedit: preserve initial author on fold (issue4296) When the authorship of the changeset folded in does not match that of the base changeset, we currently use the configured ui.username instead. This is especially surprising when the user is not the author of either of the changesets. In such cases, the resulting authorship (the user's) is clearly incorrect. Even when the user is folding in a patch they authored themselves, it's not clear whether they should take over the authorship. Let's instead keep it simple and always preserve the base changeset's authorship. This is also how "git rebase -i" handles folding/squashing.
author Martin von Zweigbergk <martinvonz@gmail.com>
date Wed, 13 Aug 2014 11:50:13 -0700
parents 37a5decc6924
children dabf8fb8a91e d43d116a118c
line wrap: on
line diff