|
From: | Eric Blake |
Subject: | Re: git-merge-changelog limitation? |
Date: | Tue, 05 Oct 2010 16:13:08 -0600 |
User-agent: | Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.9) Gecko/20100921 Fedora/3.1.4-1.fc13 Mnenhy/0.8.3 Thunderbird/3.1.4 |
On 10/05/2010 04:05 PM, Bruno Haible wrote:
Well, I would consider it a bug in git if it didn't invoke the declared merge driver. That is the point of a custom merge driver.
My understanding is that git only invokes the custom merge driver IF there was a diff conflict. But when the default git diff doesn't detect a conflict, then you ALSO have to have a custom diff driver.
Let me know if you need me to spend time writing up an exact formula to reproduce the steps that led to my ChangeLog message not being rebased the way I think it should be.Yes, please. This will be useful to revisit once we have unit tests for the normal operation of git-merge-changelog.
OK, although it may be another day or two (I've got bigger things on my plate right now, like strstr and memmem broken in glibc due to a bug in my str-two-way.h).
-- Eric Blake address@hidden +1-801-349-2682 Libvirt virtualization library http://libvirt.org
[Prev in Thread] | Current Thread | [Next in Thread] |