Linus Torvalds wrote:
>On Fri, 12 Sep 2008, Sam Vilain wrote:
>It can happen even without any conflicts, just because the context
>changed. So it really isn't about merge conflicts per se, just the fact
>that a patch can change when it is applied in a new area with a three-way
>diff - or because it got applied with fuzz.
Quite.
>You could add it as a
> Original-patch-id: <sha1>
That will probably work fine when operating locally on (short) temporary
branches.
It would probably become computationally prohibitive to use it between
long lived permanent branches. In that case it would need to be
augmented by the sha1 of the originating commit. Which gives you two
hashes as reference, and in that case you might as well use the two
commit hashes of which the difference yields the patch.
--
Sincerely,
Stephen R. van den Berg.
"Father's Day: Nine months before Mother's Day."
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
