Re: Kernel SCM saga..

Roman Zippel
2005-04-09T17:41:06Z

Hi,

On Sat, 9 Apr 2005, Eric D. Mudama wrote:

> > For example bk does something like this:
> >
> > A1 -> A2 -> A3 -> BM
> > \-> B1 -> B2 --^
> >
> > and instead of creating the merge changeset, one could merge them like
> > this:
> >
> > A1 -> A2 -> A3 -> B1 -> B2
> >
> > This results in a simpler repository, which is more scalable and which
> > is easier for users to work with (e.g. binary bug search).
> > The disadvantage would be it will cause more minor conflicts, when changes
> > are pulled back into the original tree, but which should be easily
> > resolvable most of the time.
>
> The kicker comes that B1 was developed based on A1, so any test
> results were based on B1 being a single changeset delta away from A1.
> If the resulting 'BM' fails testing, and you've converted into the
> linear model above where B2 has failed, you lose the ability to
> isolate B1's changes and where they came from, to revalidate the
> developer's results.

What good does it do if you can revalidate the original B1? The important
point is that the end result works and if it only fails in the merged
version you have a big problem. The serialized version gives you the
chance to test whether it fails in B1 or B2.

> I believe that flattening the change graph makes history reproduction
> impossible, or alternately, you are imposing on each developer to test
> the merge results at B1 + A1..3 before submission, but in doing so,
> the test time may require additional test periods etc and with
> sufficient velocity, might never close.

The merge result has to be tested either way, so I'm not exactly sure,
what you're trying to say.

bye, Roman