Handling multiple parallel versions.

From: Ian Hobson <ian@ianhobson.co.uk>
Date: Jul 21, 2010, 15:28 UTC
Message-ID: <4C471223.9050303@ianhobson.co.uk>

Hi All,

I need your advice.  I started with the "Rebase master" approach.

Now I have...

O--O--O--O--O--O--O--many more--O--O--O--O--O--O--O--O  Master
| \
|  O--O--O--O--O--O--O--many more--O--O--O--O--O--O--O--O London
|
| \ O--O--O--O--O--O--O--many more--O--O--O--O--O--O--O--O Birmingham
|
| \ O--O--O--O--O--O--O--many more--O--O--O--O--O--O--O--O Glasgow
|
| \ O--O--O--O--O--O--O--many more--O--O--O--O--O--O--O--O Sheffield
|
  \ O--O--O--O--O--O--O--many more--O--O--O--O--O--O--O--O Cardiff

All the rebase master's are taking an age (and involve many conflicts). They are taking linger than the development.

So this solution is NOT working for maintaining parallel versions.

I can get to.

O  Master
| \
|  O   London
|\
|  O  Birmingham
etc

by re-applying the differences between each version (they are a set of images and a config file).

Then I am left with the main problem that I need help with.

When I have done some development and I have

O--A--B  Master
| \
|  O   London
|\
|  O  Birmingham
etc

how do I get to the following?

O--A--B  Master
            | \
            |  B''   London
            |\
            |  B'''  Birmingham
              etc

Answers gratefully received.

Regards

Ian