Mon, 06 Feb 2006 17:32:10 -0600 hgmerge: various cleanups
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Mon, 06 Feb 2006 17:32:10 -0600] rev 1701
hgmerge: various cleanups Details: - put temporary file names into variables - make all temporary file names end with random part - cleanup FileMerge handling - do not use hardlinks in FileMerge change test (breaks on FAT) - try harder to keep file mtime unchanged in case of failed merge
Mon, 06 Feb 2006 17:32:06 -0600 hgmerge: add cleanup functions
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.
Mon, 06 Feb 2006 17:32:00 -0600 hgmerge: add and use more tool variables
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.
Sun, 05 Feb 2006 22:21:02 -0600 Update copyright notice
Matt Mackall <mpm@selenic.com> [Sun, 05 Feb 2006 22:21:02 -0600] rev 1698
Update copyright notice
Sun, 05 Feb 2006 22:18:38 -0600 Merge with crew
Matt Mackall <mpm@selenic.com> [Sun, 05 Feb 2006 22:18:38 -0600] rev 1697
Merge with crew
Fri, 03 Feb 2006 12:58:40 +0100 Merge with Peter van Dijk
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 03 Feb 2006 12:58:40 +0100] rev 1696
Merge with Peter van Dijk
Fri, 03 Feb 2006 12:56:41 +0100 remove escaping from decriptions on repo index page
Peter van Dijk <peter@dataloss.nl> [Fri, 03 Feb 2006 12:56:41 +0100] rev 1695
remove escaping from decriptions on repo index page
Fri, 03 Feb 2006 12:50:02 +0100 Added raw view for file annotate in hgweb.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 03 Feb 2006 12:50:02 +0100] rev 1694
Added raw view for file annotate in hgweb.
Fri, 03 Feb 2006 11:54:16 +0100 hgweb/templates: remove unused vars from map-raw
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
Fri, 03 Feb 2006 11:54:12 +0100 hgweb/templates: no need to escape the '<' '>' and '&' in raw templates
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
(0) -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip