Re: [Monotone-devel] Best practice using monotone

[jack-monotone]

I had meant to add the note about the Oedipus Rex merge, but forgot. 

--Jack 
    
> === Release Branch Pattern

...
 
>     NOTES:
> 
>       - if one of the sub-branches added a file to a directory that was
>         dropped in the 'example.com.foo.delivebles' branch, then you'll get a
> non merge conflict when you do the propagate. These are a pain to solve, at
> least until the workspace merge is integrated into mainline monotone. 

    - you have created a release branch, and massaged the release branch to
      contain only what you want to deliver. Be careful not to merge or
propagate from the release branch to the work branch. Doing so would be what I
call an "Oedipus Rex" merge -- it will propagate all of the massaging your did
on the release branch back to the work branch. In this pattern, release
branches are not intended to be merged back to trunk.

--Jack 

--
Jack (John) Cummings                           http://mudshark.org/
PGP fingerprint: F18B 13A3 6D06 D48A 598D  42EA 3D53 BDC8 7917 F802

pgp2SWIseUXis.pgp
Description: PGP signature