Wed, 23 Sep 2009 15:58:07 +0200 color: mark --no-color as deprecated (--color=never has the same effect)
Brodie Rao <me+hg@dackz.net> [Wed, 23 Sep 2009 15:58:07 +0200] rev 9478
color: mark --no-color as deprecated (--color=never has the same effect) This should've been marked deprecated when --color was first introduced, but it was something I overlooked.
Wed, 23 Sep 2009 15:57:25 +0200 mention overlay bundle file in global --repository option
Adrian Buehlmann <adrian@cadifra.com> [Wed, 23 Sep 2009 15:57:25 +0200] rev 9477
mention overlay bundle file in global --repository option see http://mercurial.selenic.com/wiki/LookingIntoBundles Drop mentioning symbolic path names for the sake of brevity. This is a common feature of path options anyway.
Wed, 23 Sep 2009 15:54:43 +0200 merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 23 Sep 2009 15:54:43 +0200] rev 9476
merge with crew-stable
Wed, 23 Sep 2009 15:51:36 +0200 localrepo: fix bugs in branchheads and add docstring
Sune Foldager <cryo@cyanite.org> [Wed, 23 Sep 2009 15:51:36 +0200] rev 9475
localrepo: fix bugs in branchheads and add docstring - The call to reverse() reversed the list in place in the global branchmap. - The nodesbetween function doesn't preserve ordering.
Wed, 23 Sep 2009 15:36:51 +0200 convert: fix marshalling in P4 convert extension to use a binary stream
Peter Ingebretson <pingebre@yahoo.com> [Wed, 23 Sep 2009 15:36:51 +0200] rev 9474
convert: fix marshalling in P4 convert extension to use a binary stream The Perforce convert extension uses the p4 -G command line option and marshal.load to obtain information about the history of a Perforce depot. The method marshal.load must be provided with a binary stream (mode='rb') in order to function reliably. Certain changelist descriptions or other elements in a depot history could trigger a premature EOFError, causing the conversion process to fail. This may resolve the issue discussed in the following thread: http://www.selenic.com/pipermail/mercurial/2009-July/026813.html
Wed, 23 Sep 2009 15:19:26 +0200 merge with mpm
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 23 Sep 2009 15:19:26 +0200] rev 9473
merge with mpm
(0) -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip