Fri, 01 Jan 2010 15:45:48 -0600 Merge with crew
Matt Mackall <mpm@selenic.com> [Fri, 01 Jan 2010 15:45:48 -0600] rev 10192
Merge with crew
Fri, 01 Jan 2010 21:49:05 +0100 mq: qdiff with the same diff options than qrefresh (issue1350)
Patrick Mezard <pmezard@gmail.com> [Fri, 01 Jan 2010 21:49:05 +0100] rev 10191
mq: qdiff with the same diff options than qrefresh (issue1350) Specifically, if current patch is a git patch and mq.git=keep, diff in git mode.
Fri, 01 Jan 2010 21:21:34 +0100 mq: upgrade to git patch when necessary (issue767)
Patrick Mezard <pmezard@gmail.com> [Fri, 01 Jan 2010 21:21:34 +0100] rev 10190
mq: upgrade to git patch when necessary (issue767)
Fri, 01 Jan 2010 20:54:05 +0100 patch: support diff data loss detection and upgrade
Patrick Mezard <pmezard@gmail.com> [Fri, 01 Jan 2010 20:54:05 +0100] rev 10189
patch: support diff data loss detection and upgrade In worst case, generating diff in upgrade mode can be two times more expensive than generating it in git mode directly: we may have to regenerate the whole diff again whenever a git feature is detected. Also, the first diff attempt is completely buffered instead of being streamed. That said, even without having profiled it yet, I am convinced we can fast-path the upgrade mode if necessary were it to be used in regular diff commands, and not only in mq where avoiding data loss is worth the price.
Fri, 01 Jan 2010 20:52:05 +0100 Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Fri, 01 Jan 2010 20:52:05 +0100] rev 10188
Merge with crew-stable
Fri, 01 Jan 2010 15:33:51 -0600 Merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 01 Jan 2010 15:33:51 -0600] rev 10187
Merge with stable
(0) -10000 -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip