Mon, 09 Oct 2006 21:04:25 -0500 fix workingfilectx parents and ancestor functions
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 21:04:25 -0500] rev 3298
fix workingfilectx parents and ancestor functions
Mon, 09 Oct 2006 20:32:03 -0500 merge: pass contexts to applyupdates
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 20:32:03 -0500] rev 3297
merge: pass contexts to applyupdates
Mon, 09 Oct 2006 18:13:38 -0500 merge: don't call hooks for revert
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 18:13:38 -0500] rev 3296
merge: don't call hooks for revert - don't call hooks for revert - use extra variables to avoid swapping contexts
Mon, 09 Oct 2006 16:07:19 -0500 merge: use contexts for manifestmerge
Matt Mackall <mpm@selenic.com> [Mon, 09 Oct 2006 16:07:19 -0500] rev 3295
merge: use contexts for manifestmerge - take ma, backwards, and copy out of update - move findcopies call inside manifestmerge - pass repo rather than ui
(0) -3000 -1000 -300 -100 -30 -10 -4 +4 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip