[Quilt-dev] Re: gendiff command

[Peter Braam]

Nope that's not what we want I think.

Let me one more time give the example.  Suppose we have a patch for 
linux-2.4.20, p-2.4.20.patch and another one p-2.4.22.patch in two 
series files.
A developer will change p-2.4.20.patch.   The "diff of the 2.4.20 diff" 
is not so useful to the 2.4.22 developer, what is useful is:
diff between tree with series upto including p-2.4.20.patch applied 
before and after the update to this patch.  That is a diff that is quite 
likely to go into 2.4.22 without difficulties, to aid updating the 
2.4.22 patch.
So our gendiff creates a diff on partially applied series to transport 
that diff to another series easilyh.
Clear now?

Peter

Andreas Gruenbacher wrote:

> On Wed, 2003-10-22 at 01:07, Peter Braam wrote:
>  
>
> > Looks good.
> >
> > So if we are at patch <k> and we have modified <k> we still get the diff 
> > between
> > tree + <1> -<k>
> > and our changed version of that right? I.e. patches further ahead in 
> > the series are not involved?
> >    
> Not sure what you mean. This will give you the diff between the original
> a.diff and its updated version:
>
>         $ quilt push            # pushes a.diff
>         $ quilt snapshot
>         # edit something
>         $ quilt refresh
>         $ quilt diff --snapshot
>
> This would give you some sort of roll-up diff (I don't think this is
> very useful in general):
>
>         $ quilt push            # pushes a.diff
>         $ quilt snapshot
>         # edit something
>         $ quilt refresh
>         $ quilt push -a         # until z.diff
>         $ quilt diff --snapshot
>
> I haven't tried yet, but this should again give only the changes in a.diff:
>
>         $ quilt push            # pushes a.diff
>         $ quilt snapshot
>         # edit something
>         $ quilt refresh
>         $ quilt push -a         # until z.diff
>         $ quilt diff -P a.diff --snapshot
>
> Okay?
>