star or parallele merge

[James Blackwell]

On Sun, 2005-10-02 at 22:35 -0500, John A Meinel wrote:
> >>#1 A - B - C - D - E - F
> >>#  | \       \
> >>#2  \  G - H - I - M
> >>#    \           /
> >>#3     J - K - L
> >>
> >>The question here, is that "cd $1; bzr missing $2"
> >>should certainly show G-H-I-M, but should it show J-K-L as well?

David Allouche:
> >In the Arch tradition, "missing" would only show G-H-I-M. In my
> >experience that is what one wants most of the time.
> >
> >However, I have found that I occasionally wanted recursive-in-revisions
> >missing, J-K-L listed a as part of M. Mostly, I found that useful when
> >trying to manually resolve complicated merge situations involving mesh
> >merges or cherrypicks.
> >
> >A flat listing including J-K-L is not really useful in my experience.
> 
> Well, I think that Gustavo Niemeyer just submitted a patch, which lets 
> "bzr log" show the merges for a given revision. Since I do believe that 
> "bzr missing" uses the LogFormatter (if it doesn't, it should), then I 
> think we will get the nested list by default.

I second David. If the user says "bzr missing $2", then he has explicitely
asked for what was missing in $2 and that is what he should get. If you
can forgive me for supplying empirical evidence...

Consider Collin's integration branch. This branch is the ad-hoc
centralization point for bleed-edge community development. Branches such
as his are heavily focused upon coordinating merges from sources 2nd class
developers (enthusiasts and occasional developers). Collin's branch more
than rarely merges from five branches a week, each with one to ten
revisions of their own. This can result in as many as 110 "changesets"
being introduced into Collin's tree each week. 

Many developers are (or should be) interested in what they're missing from
Collins' branch. Though they are interested in checking every two or three
weeks to see whether or not Collins has performed work that they are
missing. Thusly, they'll typically be interested in those 10-30 revisions
that Collins did, but won't be as interested in the 100-300 revisions that
was behind the scenes for Collin's work.

Thusly, I think bzr missing should only show merges for $2 by default and
have an option for --deep, --recursive or somesuch.



-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051005/9ca234d0/attachment.pgp