Sat, 31 Jul 2010 18:12:50 -0500 Merge with stable
Matt Mackall <mpm@selenic.com> [Sat, 31 Jul 2010 18:12:50 -0500] rev 11717
Merge with stable
Fri, 30 Jul 2010 10:32:24 +0300 progress: use gerund (updating) for merge progress stable
timeless <timeless@gmail.com> [Fri, 30 Jul 2010 10:32:24 +0300] rev 11716
progress: use gerund (updating) for merge progress
Sat, 10 Jul 2010 21:23:00 +0200 qpush --move: move the right patch even with comment lines stable
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>
Sat, 31 Jul 2010 11:41:58 +0900 merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 31 Jul 2010 11:41:58 +0900] rev 11714
merge with stable
(0) -10000 -3000 -1000 -300 -100 -30 -10 -4 +4 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip