merge: handle no file parent in backwards merge (
issue2364)
ui.paths: expand paths directly in fixconfig (
issue2373)
var and home expansion should be done first.
setup/hg: always load Mercurial from where it was installed.
This provides two new features:
- Mercurial may be installed into a non-standard location without
having to set PYTHONPATH.
- Multiple installations can use Mercurial from different locations.
mq: silence spurious output.
When using a versioned patch repository, you would get a spurious
warning when deleting and adding the same patch.
Before:
$ hg qdelete --keep 3.diff
$ hg qimport --existing 3.diff
adding 3.diff to series file
3.diff already tracked!
After:
$ hg qdelete --keep 3.diff
$ hg qimport --existing 3.diff
adding 3.diff to series file
tests: add testcase for
208fc9ad6a48 to test-alias.t
The testsuite lacks a testcase for the bug introduced in
208fc9ad6a48.
This patch amends
301d7626e0ff (which fixed
208fc9ad6a48) by adding a
testcase for that bug.
With
208fc9ad6a48, test-alias.t (as modified by this patch) fails
with "hg tglog: invalid arguments".
mq: handle deleting the same patch twice in one command (
issue2427)