Pierre, That's frightening. Good luck on the final stage! We're all very psyched to see it completed! scott -------------- Original message ---------------------- From: Pierre Marc Dumuid <[EMAIL PROTECTED]> > Hi all, > > For those interested, I have drawn up the process of how the 2.1 merge > occurred: > > http://cvs.cinelerra.org/~pmdumuid/2.0_to_2.1_notes/20_21merge.png > http://cvs.cinelerra.org/~pmdumuid/2.0_to_2.1_notes/20_21merge.fig > > The Magenta line shows connections where commits came from the SVN, the > red lines show commits as a result of the merge, and the black lines are > simple mergers. > > Here are the steps taken: > > 1. Determine which patch from 2.0CV had made it into 2.1, ( see > http://cvs.cinelerra.org/~pmdumuid/2.0_to_2.1_notes/patch_yesno ) > 2. Apply these patches onto the 2.0 base code, (SECTION "2.0CV into 2.1") > 3. Another branch "2.0 to 2.1" then was developed containing > incremental patches that would arrive at 2.1. > 4. Patches made in the "2.0 to 2.1" branch where then pulled into > "2.1CV plan" branch using the git merge tool. > 5. Due to some git-issues, the "2.1CV plan" branch required an > isolation from it's mergers, so a new branch, "2.1CV plan w/out > merge" was created. > 6. Patches were then collated, and ordered in a better manner and a > new branch, "2.1CV reordered" is formed. > 7. At multiple points along "2.1CV reordered", the changes are > committed to the SVN. > > At this stage, the relationships between the figure branch names and the > git branches are: > > "2.1 to 2.1 patch" http://.../~j6t/.../cinelerra2.git > "2.1CV plan" http://.../~j6t/.../cinelerra2.git#svn-plan > "2.1CV plan w/out merge" http://.../~j6t/.../cinelerra2.git#svn-plan-linear > "2.1CV reordered" http://.../~j6t/.../cinelerra2.git#svn-planj6t > > Regards, > > Pierre > > _______________________________________________ > Cinelerra mailing list > [email protected] > https://init.linpro.no/mailman/skolelinux.no/listinfo/cinelerra
_______________________________________________ Cinelerra mailing list [email protected] https://init.linpro.no/mailman/skolelinux.no/listinfo/cinelerra
