Sun, 08 Nov 2015 18:34:36 -0500 test-convert-git: silence commit output for stablity
Matt Harbison <matt_harbison@yahoo.com> [Sun, 08 Nov 2015 18:34:36 -0500] rev 26903
test-convert-git: silence commit output for stablity When running the tests with 1.7.7.6, I get 'files' and 'insertions' instead of the singular forms, and there is also an additional '0 deletions(-)' at the end. Since this doesn't seem important to the test, silence it.
Sun, 08 Nov 2015 17:56:48 -0500 rebase: preserve the 'intermediate-source' attribute of grafts
Matt Harbison <matt_harbison@yahoo.com> [Sun, 08 Nov 2015 17:56:48 -0500] rev 26902
rebase: preserve the 'intermediate-source' attribute of grafts Preserving the 'source' attribute of grafts started with a69a77a80900, which predates the introduction of 'intermediate-source' in 51930a7180bd by a year and a half. It looks like not preserving this was an oversight. On a related note, notice how the source value of 32af76 is no longer visible in the graph above this test. Is it reasonable to import the sha1 translation from evolve.py:relocate() into scmutil or similar, and use that to fixup these attributes as well as the commit message? (I realize that evolve is still experimental, but I don't see a way to do this from the evolve extension.)
Wed, 11 Nov 2015 15:08:08 -0600 merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 11 Nov 2015 15:08:08 -0600] rev 26901
merge with stable
(0) -10000 -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 +10000 tip