Martin Geisler <mg@aragost.com> [Wed, 07 Jul 2010 14:29:40 +0200] rev 11517
Merge with stable
Martin Geisler <mg@aragost.com> [Wed, 07 Jul 2010 14:13:23 +0200] rev 11516
test-merge-closedheads: test
cc982ff2dcf8
Robert Bauck Hamar <r.b.hamar@usit.uio.no> [Wed, 07 Jul 2010 14:11:59 +0200] rev 11515
commands: only warn when reopening the workdir's branch
When commiting, a check is made to see if one of the parents is a
closed head. However this did not check that the branch of the commit
is the same as the closed head, so one could get a warning message on
the sequence
hg commit --close-branch
hg branch new-branch
hg commit
or when merging in a closed head.
Martin Geisler <mg@lazybytes.net> [Tue, 06 Jul 2010 20:43:19 +0200] rev 11514
Merge with stable
Yuya Nishihara <yuya@tcha.org> [Sun, 28 Mar 2010 15:23:11 +0900] rev 11513
mq: fixed ENOENT when qrename to new/directory.patch
MQ patch name can contain slashes, e.g. 'foo/bar.patch'.
Currently "qnew foo/bar.patch" works, but
"qrename foo/bar.patch new/dir.patch" fails with
"No such file or directory".
Also added test case for "qnew foo/bar.patch"
Julian Cowley <julian@lava.net> [Fri, 02 Jul 2010 14:14:30 -1000] rev 11512
mercurial.spec: rename docutils to python-docutils in BuildRequires
Even though the name of the project is Docutils, most packagers use
the package name python-docutils to fit into the naming scheme of
other packages written in Python. The name is used by Fedora, EPEL,
DAG, Mandriva, and a few other distributions.
Renato Cunha <renatoc@gmail.com> [Tue, 06 Jul 2010 13:10:16 -0300] rev 11511
glossary: fixed typo in "Directory, working" description
The term "Directory, working" referenced a non-existant term named "Parents,
working directory". This patch fixes the typo.
Martin Geisler <mg@lazybytes.net> [Sun, 04 Jul 2010 14:14:40 +0200] rev 11510
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sun, 04 Jul 2010 14:14:29 +0200] rev 11509
test-log: also test "log -p -R" case
Yuya Nishihara <yuya@tcha.org> [Fri, 02 Jul 2010 23:49:06 +0900] rev 11508
log: fix missing diff output for hg log -p in sub directory
prep(ctx, fns) receives paths relative to repository root, not cwd.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 04 Jul 2010 17:05:17 +0900] rev 11507
commands: document return values of add and paths commands
Martin Geisler <mg@lazybytes.net> [Sat, 03 Jul 2010 02:15:25 +0200] rev 11506
mergetools.hgrc: add vimdiff
Imported from deb_specific__mergetools patch in Debians patch queue:
http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/
Martin Geisler <mg@lazybytes.net> [Sat, 03 Jul 2010 02:06:07 +0200] rev 11505
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sat, 03 Jul 2010 01:56:09 +0200] rev 11504
zeroconf: small fixes in docstring
Use reST role for consistency, import small part of Debian's
proposed_upstream__correct-zeroconf-doc patch from
http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/
Martin Geisler <mg@lazybytes.net> [Sat, 03 Jul 2010 02:03:55 +0200] rev 11503
hgweb: add link to wiki
Martin Geisler <mg@lazybytes.net> [Sat, 03 Jul 2010 01:48:50 +0200] rev 11502
hgweb.wsgi: add a URL to the corresponding wiki documentation
Imported for_upstream__add_doc_url_in_example_files.patch from
Debian's patch queue:
http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/
Renato Cunha <renatoc@gmail.com> [Thu, 01 Jul 2010 19:27:03 -0300] rev 11501
churn: remove tuple parameter unpacking (deprecated in py3k)
Renato Cunha <renatoc@gmail.com> [Thu, 01 Jul 2010 19:27:03 -0300] rev 11500
record: removed 'reduce' calls (unsupported by py3k)
Quoting python's documentation, "Note that sum(range(n), m) is
equivalent to reduce(operator.add, range(n), m)". The "sum" function
is a builtin from 2.3 on and there's no reason for not to use it.
Renato Cunha <renatoc@gmail.com> [Thu, 01 Jul 2010 19:27:03 -0300] rev 11499
record: tuple parameter unpacking is deprecated in py3k
Renato Cunha <renatoc@gmail.com> [Thu, 01 Jul 2010 19:27:02 -0300] rev 11498
convert: tuple parameter unpacking is deprecated in py3k
Renato Cunha <renatoc@gmail.com> [Thu, 01 Jul 2010 19:27:02 -0300] rev 11497
revlog: Marked classic int divisions as such.
Martin Geisler <mg@aragost.com> [Fri, 02 Jul 2010 11:41:43 +0200] rev 11496
Merge with stable (again)
Mads Kiilerich <mads@kiilerich.com> [Wed, 30 Jun 2010 17:23:16 +0200] rev 11495
debugger: give a little intro before entering pdb
Mads Kiilerich <mads@kiilerich.com> [Wed, 30 Jun 2010 17:20:42 +0200] rev 11494
debugger: show traceback before entering pdb post-mortem
Martin Geisler <mg@aragost.com> [Fri, 02 Jul 2010 11:30:57 +0200] rev 11493
Merge with stable
Steve Borho <steve@borho.org> [Thu, 01 Jul 2010 19:13:23 -0500] rev 11492
wix: generate a new GUID for the help folder
A GUID change is recommended after changes like
159233cc9c14
Steve Borho <steve@borho.org> [Thu, 01 Jul 2010 12:53:37 -0500] rev 11491
wix: pick up new help topics added between 1.5 and 1.6
These files are not included the 1.6.0 installer, but will be picked up by
nightly builds as soon as this makes it to the stable branch.
Matt Mackall <mpm@selenic.com> [Thu, 01 Jul 2010 12:06:31 -0500] rev 11490
Added signature for changeset
f786fc4b8764