make: add a basic osx mpkg target

setup: make Xcode 5.1 check less specific Was failing on "5.1\n".

merge with stable

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."

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.

exchange: fix indentation level

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.

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.

merge: fix stupid indentation left over from previous refactorings

Merge with stable