openshot.developers team mailing list archive

[Jonathan Thomas <jonathan.oomph@xxxxxxxxx>]

Helen,
I guess you beat me to the merge.  Since you are the first person to
actually touch the main line of code (other than me), I thought now would be
a good time to discuss some ground rules.

Everyone in the OpenShot.Developers team can commit changes to the main line
(this is how I set it up).  However, this is probably unwise, as 1 simple
mistake could take down hundreds of people's computers (i.e. anyone who uses
the build wizard).  I'm open to suggestions here, but I really like the idea
of contributors creating a new branch, making changes to their branch, and
then I would merge them back into the main line.  This would allow for
another set of eyes to see the code, and to test the changes.  Any thoughts?

Thanks,
-Jonathan



On Wed, Jul 22, 2009 at 9:02 AM, Helen McCall <wildnfree@xxxxxxxxxxxxxxxx>wrote:

> Hello Jonathan,
>
> I've merged my changes containing the new high definition video
> profiles.
>
> I merged it with the main trunk lp:openshot
>
> Don't worry, I did a "bzr merge" first so the patches fit in correctly!
>
> You are right. bzr is very simple and easy once you've worked out how to
> use it properly!
>
> Best wishes, Helen
>
> On Wed, 2009-07-22 at 13:50 +0100, Helen McCall wrote:
> > Hi Jonathan,
> >
> > I've pushed my lp:~wildnfree/openshot/helen branch of the main OpenShot
> > code.
> >
> > At present it has only one change since Version 105:
> >
> >  my commit version 106 contains my 1920X1080 profile.
> >
> > === added file 'main/profiles/hdv_1080_25p_1920x1080'
> >
> > This is a simple addition ready for merging with the main branch.
> >
> > Please will you merge it?
> >
> > Many thanks Helen
> >
> >
> >
> > _______________________________________________
> > Mailing list: https://launchpad.net/~openshot.developers<https://launchpad.net/%7Eopenshot.developers>
> > Post to     : openshot.developers@xxxxxxxxxxxxxxxxxxx
> > Unsubscribe : https://launchpad.net/~openshot.developers<https://launchpad.net/%7Eopenshot.developers>
> > More help   : https://help.launchpad.net/ListHelp
> >
>
>
>