Re: [Monotone-devel] Synchronising changes in two branches WITHOUT the full history?

[Derek Scherger]

Richard Levitte - VMS Whacker wrote:
> This is the part that worries me the most.  Let's say I end up having
> the following branches, done the way you pictured:
>
>  openssl.097.import     Import branch for 0.9.7-stable.
>  openssl.098.import     Import branch for 0.9.8-dev, having the first
>                         commit to openssl.097.import as ancestor.
>  openssl.097.rfc3820    My hacking branch, branching off from the head
>                         of openssl.097.import.  I regularly propagate
>                         the changes made here to the openssl.098.rfc3820.
>  openssl.098.rfc3820    The branch to which I propagate changes from
>                         openssl.098.import and from openssl.097.rfc3820.
>
> With this setup, I have the following freedoms:
>
>  - to import new snapshots of 0.9.8-dev into the openssl.098.import
>    branch.
>  - to propagate changes in openssl.098.import to openssl.098-rfc3820.
>  - to propagate changes in openssl.097.rfc3820 to openssl.098-rfc3820.
>
> However, if I import a new 0.9.7-stable snapshot into the
> openssl.097.import branch, any subsequent propagations from that
> branch will include those changes.  This is OK when I propagate from
> openssl.097.import to openssl.097.rfc3820.  However, the further

I think one more branch might do it:

- openssl.097.import from your initial import and for any subsequent
  0.9.7 imports as you've described

- openssl.098.import initially created from the openssl.097.import
  branch so that they share ancestry which receives any subsequent
  0.9.8 imports again as you've described

- openssl.rfc3820 initially created from the openssl.097.import branch
  again so there's shared ancestry but specifically for the rfc3820 work
  (i.e. don't try to keep this up to date with further 0.9.7 changes just
   stick to the rfc3820 work)

- openssl.097.rfc3820 created from openssl.097.import to which you
  propagate from both openssl.097.import when things change there and from
  the openssl.rfc3820 branch as your work there progresses

- openssl.098.rfc3820 created from openssl.098.import to which you
  propagate from both openssl.098.import when things change there and from
  the openssl.rfc3820 branch as your work there progresses

What I'm trying to say here is once you've created the rfc3820 branch can
you just let it get stale with respect to 0.9.7 and keep all the propagates
flowing in one direction?

Your propagates should end up looking something like:

        - from openssl.097.import to openssl.097.rfc3820 when you get 097 
updates
        - from openssl.rfc3820    to openssl.097.rfc3820
        - from openssl.098.import to openssl.098.rfc3820 when you get 098 
updates
        - from openssl.rfc3820    to openssl.098.rfc3820

I'm not at all sure that this will work but it seems like it might. ;)

It should certainly prevent subsequent 0.9.7 changes from getting to the
0.9.8 branches.

--
Cheers,
Derek