[Gnu-arch-users] Re: Generating *context* diffs out of changesets

[Emilio Lopes]

Matthieu Moy wrote:

> Emilio Lopes <address@hidden> writes:
> 
>> Then I have another Arch project, branched from the first one, where I do
>> make my changes.
> 
> But as I understand it, you work on several features in paralel, and
> you want to cherrypick some changes to send them to upstream.

That's right.

> Another solution would be to work on one branch per feature, and to
> have an integration branch for your own needs.

That's nice for long-term changes but does it help in the following
scenario? Suppose I implement some new feature.  Then I use actually use
the modified program for some time and test my changes.  Meanwhile I've
done some updates from upstream.  Later I decide that my new implemented
feature could be somewhat improved and do further changes.  Now I'm ready
to send my new feature, consisting now of two changesets, to the upstream
maintainers.

That's pretty normal, no?  ;-)