Christian Boos <cboos@bct-technology.com> [Mon, 09 Nov 2009 20:15:49 +0100] rev 9815
rebase: make sure the newancestor is used during the whole update
(issue1561)
Before this change, newancestor was used only once as a replacement
for ancestor.ancestor, but merge.update calls ancestor.ancestor
several times, so it ends up with the "wrong" ancestor (the real
ancestor, but we want the parent of the rebased changeset for all but
the first rebased changeset).
Added a new test case for this: test-rebase-newancestor.
Also, in one scenario in test-rebase-collapse, there was a spurious
conflict caused by the same issue, so that test case was fixed by
removing the now unneeded conflict resolution and the output was
adapted accordingly.
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 10:06:08 +0100] rev 9814
buildrpm: enhance changelog of the RPM file
Now the changelog is different depending if the parent is tagged:
- for tags, keep the previous content, i.e. changelog of the tags.
- for nightly build, changelog of the changesets since the latest tag
As RPM is expecting strictly descending dates, I have used a python
script to reorder the mercurial changelog.
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 09:59:55 +0100] rev 9813
buildrpm: build full RPM package including sources
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 09:53:23 +0100] rev 9812
buildrpm: cleanup script
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 09:35:38 +0100] rev 9811
buildrpm: enable to start the script from anywhere
Previously the script worked only from the hg root.
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 09:30:18 +0100] rev 9810
buildrpm: warn if there is outstanding uncommitted changes
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 09:26:29 +0100] rev 9809
buildrpm: build from working dir parent and use hg version for RPM versioning
Previous, RPMs was always built from tip, and the release number did not match
the 'hg version' put in place for 1.4.
This will enable also to this script to be able to build official tag and not
only nightly build.
Martin Geisler <mg@lazybytes.net> [Mon, 09 Nov 2009 23:47:24 +0100] rev 9808
doc: fix language in CSS comments (by timeless)
Christian Boos <cboos@bct-technology.com> [Mon, 09 Nov 2009 17:33:16 +0100] rev 9807
setup: fix f51d1822d6fd refactoring, propagate env to runcmd
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 09 Nov 2009 17:28:40 -0200] rev 9806
clone: simplify help text
Martin Geisler <mg@lazybytes.net> [Mon, 09 Nov 2009 20:43:06 +0100] rev 9805
Merge with main
Dongsheng Song <dongsheng.song@gmail.com> [Mon, 09 Nov 2009 20:39:58 +0100] rev 9804
i18n-zh: updated Chinese translation
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 00:41:54 +0100] rev 9803
i18n-da: synchronized with 6cb1808e5ae7
Mads Kiilerich <mads@kiilerich.com> [Sun, 08 Nov 2009 18:50:39 +0100] rev 9802
test-extension: Solaris grep don't know [[:digit:]]
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 08 Nov 2009 18:18:46 +0100] rev 9801
merge with hg-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 08 Nov 2009 18:05:56 +0100] rev 9800
fix test-patchbomb on solaris
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 08 Nov 2009 17:59:36 +0100] rev 9799
fix test-diffstat on solaris
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 17:27:01 +0100] rev 9798
doc: uppercase first letter in HTML man pages
Matt Mackall <mpm@selenic.com> [Sun, 08 Nov 2009 10:40:51 -0600] rev 9797
Merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 08 Nov 2009 17:09:28 +0100] rev 9796
merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 08 Nov 2009 17:03:24 +0100] rev 9795
merge with stable
Yuya Nishihara <yuya@tcha.org> [Mon, 09 Nov 2009 00:00:47 +0900] rev 9794
doc: styles for man page, which suit with the mercurial website
designed loosely based on:
http://mercurial.selenic.com/css/styles.css
with some modifications by intention:
* visited links are colored differently
* no fixed size
* works without typeface.js
we keep most styles, which is from docutils, untouched.
tested with:
* MSIE 6.0 on Windows
* Firefox 3.5 on Linux
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 16:16:21 +0100] rev 9793
rst2man: more robust uppercasing of section titles
This handles section titles with child elements such as emphasis or
inline literals.
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 11:46:38 +0100] rev 9792
doc: use titlecase in man page section titles
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 11:41:34 +0100] rev 9791
rst2man: automatically write sections in uppercase
Man pages have uppercased section titles but other formats do not.
Letting rst2man handle the tranformation allows better reuse of text
between man pages and other formats.
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 00:11:34 +0100] rev 9790
relink: do not translate format string with no text
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 07 Nov 2009 23:38:01 +0100] rev 9789
Use utf-8 encoding in test-branchmap's clone call
After 75520c24feda it is printed in local encoding, i.e. "C" if not set
otherwise.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 07 Nov 2009 23:35:46 +0100] rev 9788
Branch name printed since a3d73b3e1f8a now in local encoding.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 07 Nov 2009 23:27:25 +0100] rev 9787
Make test-branchmap executable and adjust output after a3d73b3e1f8a
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 22:13:09 +0100] rev 9786
ui: refer to "hg help config" when no username is set
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 22:12:50 +0100] rev 9785
help: add "hg help config" topic
This is a condensed version of the first two sections of hgrc.5.txt.
After a slight upgrade of minirst, we can move the whole of hgrc.5.txt
into the config help topic and just let the man page include it.
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 18:47:04 +0100] rev 9784
hgrc.5: do not mention "name: value" syntax
This was supported in versions prior to 1.3 where we used the standard
Python ConfigParser. The new config parser never supported it.