From: Miklos Vajna Date: Tue, 29 Jun 2010 07:54:42 GMT Subject: Re: [PATCH 4/5] merge_recursive: Fix renames across paths below D/F conflicts Message-ID: <20100629075442.GB31048@genesis.frugalware.org> In-Reply-To: <1277773936-12412-5-git-send-email-newren@gmail.com> On Mon, Jun 28, 2010 at 07:12:15PM -0600, newren@gmail.com wrote: > From: Elijah Newren > > > Signed-off-by: Elijah Newren > --- > I'm a little uneasy with this change, mainly because I don't fully > understand the rename processing logic (I was actually kind of surprised > when I made these changes and it worked). Although I verified that > these changes (and my others in this patch series) introduce no new > breakages in the testsuite and even fix a known issue, I'm still not > quite sure I follow the logic well enough to feel fully confident in > this change. I'm particularly worried I may have neglected some closely > related cases that I should have fixed but which may still be broken. Same here, I touched merge-recursive, but not this part of it, so others will give you a better review, I'm sure. :) Other than that, I like it, thanks!