Patrick Mezard <pmezard@gmail.com> [Fri, 01 May 2009 12:35:13 +0200] rev 8270
Merge with crew-stable
Steve Borho <steve@borho.org> [Thu, 30 Apr 2009 23:57:36 -0500] rev 8269
simplemerge: use ui.warn() for warnings
Mads Kiilerich <mads@kiilerich.com> [Sat, 02 May 2009 12:57:20 +0200] rev 8268
test-glog: Remove sed hack - '...$HGTMP...' isn't expanded anyway
Mads Kiilerich <mads@kiilerich.com> [Sat, 02 May 2009 12:13:24 +0200] rev 8267
test-convert-baz: hide GNU tar deprecation warning
Patrick Mezard <pmezard@gmail.com> [Fri, 01 May 2009 12:26:37 +0200] rev 8266
rebase: fix bug where --keepbranches could leave wrong branch in dirstate
Report and original fix by Augie Fackler <durin42@gmail.com>
Matt Mackall <mpm@selenic.com> [Thu, 30 Apr 2009 19:22:06 -0500] rev 8265
config: add parse interface
Alexander Solovyov <piranha@piranha.org.ua> [Mon, 27 Apr 2009 21:33:39 +0300] rev 8264
zeroconf: guess ip for Zeroconf
Zeroconf() is actually pretty dumb in guessing IPs and in case of
socket.gaierror will not guess right IP.
Matt Mackall <mpm@selenic.com> [Wed, 29 Apr 2009 20:47:30 -0500] rev 8263
config: allow spaces in key portion of items
Matt Mackall <mpm@selenic.com> [Wed, 29 Apr 2009 20:47:28 -0500] rev 8262
localrepo: use set for requirements
Matt Mackall <mpm@selenic.com> [Wed, 29 Apr 2009 20:47:18 -0500] rev 8261
dirstate: use propertycache
Matt Mackall <mpm@selenic.com> [Wed, 29 Apr 2009 20:47:15 -0500] rev 8260
localrepo: use propertycache
Steve Borho <steve@borho.org> [Thu, 30 Apr 2009 10:15:32 -0500] rev 8259
ui: replace regexp pattern with sequence of choices
Use ampersands (&) to delineate the response char in each choice.
ui.prompt() responses are now explicitly case insensitive. GUIs
that subclass ui can generate dialogs from the full choice names.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 24 Apr 2009 14:40:56 -0700] rev 8258
run-tests.py: ensure that hgpkg is always visible
Patrick Mezard <pmezard@gmail.com> [Thu, 30 Apr 2009 08:38:20 +0200] rev 8257
Fix missing import from e68e149f4d44 merge
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
Patrick Mezard <pmezard@gmail.com> [Wed, 29 Apr 2009 21:44:25 +0200] rev 8246
convert/svn: keep latest and not oldest tag value
Martijn Pieters <mj@zopatista.com> [Tue, 28 Apr 2009 17:17:54 +0200] rev 8245
Don't use sed -r; instead use old-style regexp
Rev d895158fe8af introduced some sed -r tests, but -r is only available on GNU
sed, while BSD sed uses -E. Better to use old-style regular expressions, that
way the tests work on all sed variants.
Martijn Pieters <mj@zopatista.com> [Tue, 28 Apr 2009 18:14:49 +0200] rev 8244
localrepo: Refactor var names in filecommit to improve readability.
Martin Geisler <mg@lazybytes.net> [Wed, 29 Apr 2009 18:36:55 +0200] rev 8243
merge with crew-stable
I pushed the dd1b47e17d7e to crew before realizing that it would also
be suitable for crew-stable, hence the double changeset.
Martijn Pieters <mj@zopatista.com> [Wed, 29 Apr 2009 11:39:49 +0200] rev 8242
Fix typeerror when specifying both --rebase and --pull
Martijn Pieters <mj@zopatista.com> [Wed, 29 Apr 2009 11:39:49 +0200] rev 8241
Fix typeerror when specifying both --rebase and --pull