On 2013-01-31, at 10:36, Frank Shearar <frank.shearar at gmail.com> wrote:

> On 31 January 2013 06:31, Bert Freudenberg <bert at freudenbergs.de> wrote:
>> 
>> Am 30.01.2013 um 19:50 schrieb Frank Shearar <frank.shearar at gmail.com>:
>> 
>>> Wouldn't it be better to diff against trunk rather than against the
>>> mcz's ancestor? (*)
>>> 
>>> frank
>> 
>> You should move obsolete versions out of the inbox. The diff is against the latest ancestor in inbox or trunk.
> 
> OK, but if we do that then we lose ancestry.

How so? All ancestry info is stored in each package version.

> I know what you're
> hinting at, and I'd also like to see the equivalent of a git squash -
> "take these versions in this branch and squish them together so that
> the main line only sees a single commit".

That's pretty much what happens if you move or merge a version into trunk.

> Right now that's pretty
> onerous: it'd be a manual task, fraught with opportunities to mess up.
> Er, actually, am I talking nonsense? Given some series of mczs, once
> the chain/latest has passed peer review, I could
> 
> * load the latest versions into a clean up-to-date image
> * file out the versions (so we flush the ancestry)
> * load the fileouts into a clean up-to-date image
> * commit to trunk, with suitable commit messages.
> 
> That's nearly automatable, except for the commit messages.

No, you would just merge your latest inbox thingy into trunk, and explain what that does in the commit message. When other people update, that's the only commit they see.

- Bert -