Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 02 Nov 2015 16:52:34 +0000] rev 26906
scmutil: extract general delta config handling in a function
General delta is currently controlled by a single option, we will introduce a
new one in the next changeset.
We extract the logic in a function while it is simple.
Danek Duvall <danek.duvall@oracle.com> [Tue, 10 Nov 2015 09:58:10 -0800] rev 26905
test: test-bundle-type.t needs to work more universally
The cut and head utilities on Solaris have weird differences from the GNU
versions. The f helper script does a dump more nicely than those tools,
anyway.
Anton Shestakov <av6@dwimlabs.net> [Tue, 10 Nov 2015 19:52:30 +0800] rev 26904
bash_completion: add -p|--patch|--stat support for shelve
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.
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.)
Matt Mackall <mpm@selenic.com> [Wed, 11 Nov 2015 15:08:08 -0600] rev 26901
merge with stable