Johannes Stezenbach <js@linuxtv.org> [Mon, 06 Feb 2006 17:34:53 -0600] rev 1703
fix changenav for maxchanges != 10
for maxchanges = 25 the changelog navigation had a minimum
stepsize of 30; try to calculate more useful navigation steps
Johannes Stezenbach <js@linuxtv.org> [Mon, 06 Feb 2006 17:34:39 -0600] rev 1702
add --mbox output to patchbomb
add option to save generated mails in an mbox file for later
processing with formail, instead of sending them directly
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
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