Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Mon, 06 Feb 2006 17:32:06 -0600] rev 1700
hgmerge: add cleanup functions
This patch adds functions cleanup, success and failure.
The last two of these should be used instead of exit.
Current code was changed to use them.
It also moves $HGTMP to the top of the file (it's used in the cleanup
function), changes the comment and removes now unneeded trap
in the diff+patch merge.
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Mon, 06 Feb 2006 17:32:00 -0600] rev 1699
hgmerge: add and use more tool variables
This patch adds even more customisable variables with tool paths.
Also moves $FILEMERGE where it belongs.
Matt Mackall <mpm@selenic.com> [Sun, 05 Feb 2006 22:21:02 -0600] rev 1698
Update copyright notice
Matt Mackall <mpm@selenic.com> [Sun, 05 Feb 2006 22:18:38 -0600] rev 1697
Merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 03 Feb 2006 12:58:40 +0100] rev 1696
Merge with Peter van Dijk
Peter van Dijk <peter@dataloss.nl> [Fri, 03 Feb 2006 12:56:41 +0100] rev 1695
remove escaping from decriptions on repo index page
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 03 Feb 2006 12:50:02 +0100] rev 1694
Added raw view for file annotate in hgweb.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 03 Feb 2006 11:54:16 +0100] rev 1693
hgweb/templates: remove unused vars from map-raw
annotateline contains html and it is unused
filenodelink is unused but should be defined
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 03 Feb 2006 11:54:12 +0100] rev 1692
hgweb/templates: no need to escape the '<' '>' and '&' in raw templates
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 03 Feb 2006 11:43:49 +0100] rev 1691
Removed executable bit from patchbomb extension.
lcantey@gmail.com [Fri, 03 Feb 2006 11:29:39 +0100] rev 1690
Update version strings and add release notes to Windows specific files
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 03 Feb 2006 10:54:58 +0100] rev 1689
Fall back to asciidoc6 html backend if html4 doesn't work.
This reenables building documentation on Debian sarge,
which broke after 9346a7fb3fe2.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 03 Feb 2006 10:52:25 +0100] rev 1688
Reverted name change (mercurial -> Mercurial) from dd5085897010.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 03 Feb 2006 00:52:31 -0800] rev 1687
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 03 Feb 2006 00:50:28 -0800] rev 1686
make stuff for macos x binary package.
it is now easy to make prebuilt binary for macos x. i have no hosting
space. i hope someone else can make binaries.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 02 Feb 2006 19:22:27 +0100] rev 1685
extension gpg.py: really raise the exception in case of invalid data