Matt Mackall <mpm@selenic.com> [Tue, 27 May 2014 10:31:59 -0700] rev 21558
setup: make Xcode 5.1 check less specific
Was failing on "5.1\n".
Matt Mackall <mpm@selenic.com> [Mon, 26 May 2014 18:16:23 -0700] rev 21557
merge with stable
Yuya Nishihara <yuya@tcha.org> [Sat, 17 May 2014 14:43:06 +0900] rev 21556
alias: fix loss of non-zero return code in command aliases
This also includes test for shell aliases. It avoid using "false" command
because "man false" does not say "exit with 1" but "exit with a status code
indicating failure."
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 22 May 2014 16:27:16 -0700] rev 21555
exchange: drop dead code
This code have been factorised and moved in its own function by 7d0bbb6dd730. We
actually read the result of this other computation in the very line before the
deleted block. I somehow forgot to remove the original code, but it is now
dead. Good bye duplicated computation.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 22 May 2014 13:39:55 -0700] rev 21554
exchange: fix indentation level
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 08 May 2014 17:08:17 -0700] rev 21553
import: add --partial flag to create a changeset despite failed hunks
The `hg import` command gains a `--partial` flag. When specified, a commit will
always be created from a patch import. Any hunk that fails to apply will
create .rej file, same as what `hg qimport` would do. This change is mainly
aimed at preserving changeset metadata when applying a patch, something very
important for reviewers.
In case of failure with `--partial`, `hg import` returns 1 and the following
message is displayed:
patch applied partially
(fix the .rej files and run `hg commit --amend`)
When multiple patches are imported, we stop at the first one with failed hunks.
In the future, someone may feel brave enough to tackle a --continue flag to
import.
Mads Kiilerich <madski@unity3d.com> [Mon, 19 May 2014 01:53:34 +0200] rev 21552
update: introduce --tool for controlling the merge tool
Update is a kind of merge and may also need a merge tool and should have the
options described in the merge-tools help.
Mads Kiilerich <madski@unity3d.com> [Fri, 02 May 2014 01:09:14 +0200] rev 21551
merge: fix stupid indentation left over from previous refactorings
Augie Fackler <raf@durin42.com> [Mon, 26 May 2014 12:39:31 -0400] rev 21550
Merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Tue, 29 Apr 2014 14:12:32 -0700] rev 21549
revsetbenchmark: support for running on other repo
We add a -R/--repo option to run the benchmarks on another repository. This is
very useful as some repository are bigger/more interesting than the mercurial one.