Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 23:17:06 -0500] rev 2919
merge: consolidate dirstate updates
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 22:46:35 -0500] rev 2918
merge: use file size stored in revlog index
Add size method to filelog to handle nodes with renames
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 18:30:21 -0500] rev 2917
merge: move forgets to the apply stage
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 18:12:36 -0500] rev 2916
trivial bool() cleanup
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 16:28:00 -0500] rev 2915
filelog.cmp: return 0 for equality
spotted by Alexis Carvalho
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 16:27:19 -0500] rev 2914
merge: hoist some working manifest logic out of merge loop
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 16:12:51 -0500] rev 2913
merge: working manifest new/changed
To remove dependence on m1 during manifest comparison, we distinguish between
new and changed states in mw.
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 15:58:10 -0500] rev 2912
merge: factor out exec bit merge function
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 15:45:45 -0500] rev 2911
Use revlog hash comparison technique in merge
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 14:18:13 -0500] rev 2910
Move cmp bits from filelog to revlog
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 14:06:50 -0500] rev 2909
Move ui.sendmail to mail.connect/sendmail
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 11:34:08 -0500] rev 2908
Move ui.diffopts to patch.diffopts where it belongs
Brendan Cully <brendan@kublai.com> [Tue, 15 Aug 2006 11:28:50 -0700] rev 2907
Unify mq and hg patch invocation.
This makes patch a little less verbose by default, so the tests
had to be updated.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 15 Aug 2006 11:43:31 -0700] rev 2906
merge.