Greg Ward <greg-hg@gerg.ca> [Mon, 14 Jun 2010 16:06:52 -0400] rev 11353
merge: when current branch has 1 or > 2 heads, actually abort.
Currently merge just prints abort-like messages to stderr and then
exits with a misleading status 0 (cleverly disguised as "False").
With this change it raises Abort, just like every other fatal error.
Greg Ward <greg-hg@gerg.ca> [Tue, 15 Jun 2010 16:10:32 -0400] rev 11352
tags: remove inactive debugging code.
It was left in just in case things went wrong with the tag cache in
Mercurial 1.4, so we could easily crank up the verbosity with a
one-line change. There have been no problems in 1.4 or 1.5, so it
should be safe to drop this now.
Greg Ward <greg-hg@gerg.ca> [Tue, 15 Jun 2010 15:02:54 -0400] rev 11351
tags: remove the old non-caching implementation of findglobaltags().
It was left behind just in case the tag cache blew up in Mercurial
1.4, so we could easily revert to the non-caching code. There have
been no problems with the tag cache in 1.4 or 1.5, so it should be
safe to get rid of this code now.
Christian Ebert <blacktrash@gmx.net> [Tue, 15 Jun 2010 17:15:31 +0200] rev 11350
keyword: postpone manifest calculation in kwtemplater.overwrite
We can check for file existence in the working directory (needed
in case of recording) by simply using the given context and
calculate the manifest only when there are in fact candidates
for expansion/shrinking.
Georg Brandl <georg@python.org> [Sun, 13 Jun 2010 23:25:27 +0200] rev 11349
revset: fix call to ctx.extra() in closed()
Martin Geisler <mg@aragost.com> [Tue, 15 Jun 2010 11:05:17 +0200] rev 11348
p4: fix long line and bad spacing around %
Frank Kingswood <frank@kingswood-consulting.co.uk> [Mon, 14 Jun 2010 16:38:36 +0100] rev 11347
Fix shell quoting on p4 conversion
Greg Ward <greg-hg@gerg.ca> [Mon, 14 Jun 2010 13:39:00 -0400] rev 11346
tests: rename test-merge3 to test-add-remove.
It tests that 'hg commit' does not crash if the user removes a newly
added file, which has nothing to do with merging.