Wagner Bruna <wbruna@yahoo.com> [Sun, 01 Aug 2010 01:54:31 -0300] rev 11722
i18n-pt_BR: synchronized with db426935fa94
Wagner Bruna <wbruna@yahoo.com> [Sun, 01 Aug 2010 01:51:21 -0300] rev 11721
Merge with stable
Wagner Bruna <wbruna@yahoo.com> [Sun, 01 Aug 2010 01:46:58 -0300] rev 11720
i18n-pt_BR: synchronized with 0e789549271d
Jens Bäckman <jens@titv.se> [Sun, 25 Jul 2010 10:51:05 +0200] rev 11719
i18n-sv: synchronized with c47cb3193c53
Matt Mackall <mpm@selenic.com> [Sat, 31 Jul 2010 18:27:03 -0500] rev 11718
help: fix bytes/digit confusion for hashes
spotted by FUJIWARA Katsunori <fujiwara@ascade.co.jp>
Matt Mackall <mpm@selenic.com> [Sat, 31 Jul 2010 18:12:50 -0500] rev 11717
Merge with stable
timeless <timeless@gmail.com> [Fri, 30 Jul 2010 10:32:24 +0300] rev 11716
progress: use gerund (updating) for merge progress
Gilles Moris <gilles.moris@free.fr> [Sat, 10 Jul 2010 21:23:00 +0200] rev 11715
qpush --move: move the right patch even with comment lines
88fc876a4833 caused that we find the index of the moving patch in self.series
but look it up in self.full_series. The difference between these is that
full_series also contains comment lines, and we thus moved the wrong patch.
Use back self.full_series to find the moving patch, but take care of striping
the patch guard markers before comparing the patch name. Test cases have been
added for comments and empty lines in self.full_series, and for the case of
guarded patches.
Original patch contributed by Mads Kiilerich <mads@kiilerich.com>
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 31 Jul 2010 11:41:58 +0900] rev 11714
merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 31 Jul 2010 11:41:42 +0900] rev 11713
perf: break down long line