Patrick Mezard <pmezard@gmail.com> [Wed, 29 Apr 2009 23:56:20 +0200] rev 8256
Merge with crew-stable
Sune Foldager <cryo@cyanite.org> [Wed, 29 Apr 2009 09:30:28 +0200] rev 8255
util.rename: use temporary file name for rename-targets on windows
Use a temporary file name as target for a forced rename on Windows. The
target file name is not opened at any time; just renamed into and then
unlinked. Using a temporary instead of a static name is necessary since
otherwise a hg crash can leave the file lying around, blocking future
attempts at renaming.
Martin Geisler <mg@lazybytes.net> [Wed, 29 Apr 2009 20:03:54 +0200] rev 8254
churn: use .hgchurn in repo root as default map file
Martin Geisler <mg@lazybytes.net> [Sun, 26 Apr 2009 01:49:12 +0200] rev 8253
win32text: add copyright header
Martin Geisler <mg@lazybytes.net> [Sun, 26 Apr 2009 01:48:53 +0200] rev 8252
patchbomb: add copyright and license header
Martin Geisler <mg@lazybytes.net> [Sun, 26 Apr 2009 01:48:43 +0200] rev 8251
highlight: add copyright and license header
Martin Geisler <mg@lazybytes.net> [Sun, 26 Apr 2009 01:47:44 +0200] rev 8250
convert: add copyright and license headers to back-ends
Greg Ward <greg-hg@gerg.ca> [Sat, 18 Apr 2009 13:29:48 -0400] rev 8249
Reproduce crash where synthetic revs break merge detection (issue1578).
(The fix for this was committed as 9bbcfa898cd3.)
Slightly edited by Patrick Mezard <pmezard@gmail.com>
Patrick Mezard <pmezard@gmail.com> [Wed, 29 Apr 2009 21:48:59 +0200] rev 8248
convert/svn: ignore composite tags
Tools like cvs2svn generate tags made of files coming from different revisions
from different branches. This is not supported by Mercurial, and it slows down
the conversion a lot. Ignore them.
See bacula@4082 for a sample.
Patrick Mezard <pmezard@gmail.com> [Wed, 29 Apr 2009 21:48:15 +0200] rev 8247
Merge with crew-stable