Monticello change log history?
Bert Freudenberg
bert at impara.de
Thu Jun 22 08:14:55 UTC 2006
Does anyone know a good order in which to display these versions? We
currently use a a breadth-first order in the ancestor graph, which is
also used when you click the "history" button in MC (a version
usually has only one ancestor, but if a merge happend, it can have
more than one, forming an acyclic directed graph).
Here's an example in chronological order:
1. A1 (--) - developer A starts a package
2. A2 (A1) - A produces more code
3. A3 (A2) - A fixes bugs
4. B4 (A3) - developer B branches
5. A4 (A3) - A continues on trunk
6. B5 (B4) - B develops on branch
7. B6 (B5) - B develops on branch
8. A5 (A4, B6) - A merges B's latest
9. A6 (A5) - A continues
but in breadth-first order this becomes:
9. A6 (A5) - A continues
8. A5 (A4, B6) - A merges B's latest
5. A4 (A3) - A continues on trunk
7. B6 (B5) - B develops on branch
3. A3 (A2) - A fixes bugs
6. B5 (B4) - B develops on branch
2. A2 (A1) - A produces more code
4. B4 (A3) - developer B branches
1. A1 (--) - developer A starts a package
... which is a bit counter-intuitive.
I wonder if there is some order or indentation scheme to better
indicate the merge history. But it would have to be able to show even
more complex cases than this rather simple example.
- Bert -
Am 22.06.2006 um 08:08 schrieb Andreas Raab:
> Ah! Yes! Thank you! This is *just* what I was looking for. Mark -
> can we get we get this patch into the Croquet repository? I think
> it'll be in particular helpful for people trying to understand what
> happened, say between Croquet-Objects-das.113.mcz (the version in
> the Hedgehog release) and Croquet-Objects-ar.155.mcz (the version
> that I just sync-ed from the Qwaq repository ;-)
>
> Cheers,
> - Andreas
>
> Bert Freudenberg wrote:
>> Am 19.06.2006 um 22:08 schrieb Andreas Raab:
>>> So if this information is indeed readily available please let me
>>> know where and how (and perhaps I can convince a SqueakSource
>>> developer to add the change log to the actions for a package
>>> version?).
>> Done:
>> http://source.impara.de/ss.html
>> - Bert -
>
More information about the Squeak-dev
mailing list
|