Code review comment for lp:~jelmer/bzr/2.1-feature-flags

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

> > The actual implementation doesn't have extract_format_string, since it
> doesn't
> > apply there (it has a more complex parsing function).
> Ok, so you will remove extract_format_string when merging up then. Ok, I was
> hoping we could keep it and add the needed features instead to keep a single
> place to maintain, but no big deal as long as we can keep the tests ?
Yep.

> > I'll look into the
> > failures.
> Cool.
Fixed now.

> > > Finally, I don't quite understand why you 4 proposals instead of just this
> > > one. If they are all the same, no need for 4 reviews, once this one is
> > > approved, just merge up to trunk.
> > They aren't the same, there are differences to the format infrastructure for
> > each branch that would otherwise cause conflicts.
> :-/ Let's hope we don't need to fix bugs there then. Maintaining the same
> feature in 5 (or 6 ?) different forms *for* a dvcs tool sounds like a good way
> to become insane ;
It's not radically different, but simply upmerging triggers conflicts.

I've tested this in a lucid chroot, as 2.1's testsuite indeed doesn't run on precise.

Cheers,

Jelmer

« Back to merge proposal