Re: How to handle Debian patches
Pierre Habouzit <madcoder@debian.org> writes:
> On Mon, May 19, 2008 at 04:06:36PM +0000, Manoj Srivastava wrote:
>> B) (This is an honest question). How many things can rerere remember? If
>> I use rerere to record how to resolve current conflicts in feature
>> branches, does the historical information get lost? (like, I use
>> rerere to help merging the current upstream version, do we lose
>> information about previous upstream versions?)
>
> git-rerere keeps recorded conflicts resolution for 60 days by default,
> and it's configureable, and it needs to use git-gc (or git rerere gc) to
> cleanse it, so if you don't, it just won't disappear.
If you have a feature branch that won't be accepted upstream then that
can be years old. And conflicts could have been resolved right at the
start of that time.
How does git-rerere dig out that years old conflict resolution?
How do you tell git-rerere to keep all conflict resolutions needed to
convert feature branches into a patch series but not others?
How sure are you that will actually work right and not misidentify
code at the wrong places? Ok, I guess you can compare the patch series
output against the integration branch and they should be identical.
MfG
Goswin
Reply to: