Giorgos Keramidas <keramida@ceid.upatras.gr> [Mon, 14 Aug 2006 16:06:37 +0300] rev 2900
hgweb: partially revert 4ec58b157265
The change from self.repo.ui.diffopts() to ui.diffopts() causes a
traceback when the diff of a changeset should be displayed in the
web interface. Revert to self.repo.ui.diffopts() for now.
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 23:17:06 -0500] rev 2899
merge: consolidate dirstate updates
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 22:46:35 -0500] rev 2898
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 2897
merge: move forgets to the apply stage
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 18:12:36 -0500] rev 2896
trivial bool() cleanup
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 16:28:00 -0500] rev 2895
filelog.cmp: return 0 for equality
spotted by Alexis Carvalho
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 16:27:19 -0500] rev 2894
merge: hoist some working manifest logic out of merge loop
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 16:12:51 -0500] rev 2893
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 2892
merge: factor out exec bit merge function
Matt Mackall <mpm@selenic.com> [Tue, 15 Aug 2006 15:45:45 -0500] rev 2891
Use revlog hash comparison technique in merge