Mercurial: tests/README@9ac98c2aa95c (annotated)

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.

332 6c869059beb4 testing fixups mpm@selenic.com parents: 331 diff changeset	1	To run the tests, do:
6c869059beb4 testing fixups mpm@selenic.com parents: 331 diff changeset	2
6c869059beb4 testing fixups mpm@selenic.com parents: 331 diff changeset	3	cd tests/
2207 8a2a7f7d9df6 Delete the shell version of run-tests Stephen Darnell <stephen@darnell.plus.com> parents: 1933 diff changeset	4	python run-tests.py
332 6c869059beb4 testing fixups mpm@selenic.com parents: 331 diff changeset	5
8936 1de6e7e1bb9f change wiki/bts URLs to point to new hostname Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 3934 diff changeset	6	See http://mercurial.selenic.com/wiki/WritingTests for
3934 d0bbd8ee50c7 Move test suite docs to the wiki Matt Mackall <mpm@selenic.com> parents: 3199 diff changeset	7	more information on writing tests.

author	Martin von Zweigbergk <martinvonz@gmail.com>
	Wed, 13 Aug 2014 11:50:13 -0700
branch	stable
changeset 22147	9ac98c2aa95c
parent 8936	1de6e7e1bb9f
child 26421	4b0fc75f9403
permissions	-rw-r--r--