trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: December 2011

Re: [trinity-devel] Trinity 3.5.13 build for Arch linux

From: Baho Utot <baho-utot@...>
Date: Fri, 23 Dec 2011 20:00:10 -0500

On Friday 23 December 2011 07:34:52 pm Calvin Morrison wrote:
> On 23 December 2011 19:32, Baho Utot <baho-utot@...> wrote:
> > On Friday 23 December 2011 07:27:45 pm Calvin Morrison wrote:
> > > On 23 December 2011 19:26, Baho Utot <baho-utot@...> wrote:
> > > > On Friday 23 December 2011 07:07:20 pm Calvin Morrison wrote:
> > > > > On 23 December 2011 17:50, Baho Utot <baho-utot@...>
> >
> > wrote:
> > > > > > [putolin]
> > > > > >
> > > > > > > > The TDE project provides GIT space to all distribution
> >
> > packagers.
> >
> > > > > > > > You can even maintain two separate copies of packaging files
> >
> > for
> >
> > > > > > > > a distribution if so desired; I leave all policy control
> > > > > > > > within the distribution folder up to those who are actively
> > > > > > > > working on that distribution.
> > > > > > > >
> > > > > > > > Let me know if you need a GIT account.
> > > > > > > >
> > > > > > > > Tim
> > > > > > >
> > > > > > > We may as well keep a "Baho" folder for the builds contributed
> > > > > > > by
> > > >
> > > > Baho.
> > > >
> > > > > > > Currently we have a 3.5.13 folder and a GIT (currently not
> >
> > working
> >
> > > > > > > - waiting for git to settle out) folder. Another one won't
> > > > > > > hurt.
> > > > > > >
> > > > > > > Calvin
> > > > > >
> > > > > > I am all for a single git arch pkgbuild directory.  By having
> > > > > > more than one only creates problems.  If there is one place then
> > > > > > every
> >
> > one
> >
> > > > > > can
> > > >
> > > > pull
> > > >
> > > > > > from there and create their own branch.  Then you can merge back
> >
> > into
> >
> > > > the
> > > >
> > > > > > master and push to the public repo.  At least that is what I get
> >
> > from
> >
> > > > the
> > > >
> > > > > > git community book.  After I get access to a git repo I will see
> > > > > > if it works that
> > > > > > way.
> > > > >
> > > > > sure let's stick to using branches :) that is more proper. Then we
> >
> > can
> >
> > > > > merge onto to master branch as we go.
> > > >
> > > > Ok I have git access now.
> > > >
> > > > Is there a test area I can experiment with?
> > > >
> > > > I setup an account on gitotious as a test but I can do anything with
> >
> > it;(
> >
> > > > all
> > > > it does is hangup on me.
> > >
> > > As for external services - I recommend github 100%!
> >
> > I am just trying to get a git repo so test so I don't blowup the trinity
> > repo
> > while learning.
>
> you can blow it up as much as you wont - just don't push the changes.
>
> I suggest viewing these videos - they helped me understand using git a bit
> better
>
> http://www.youtube.com/watch?v=74yphulj3uo
> http://www.youtube.com/watch?v=TCFZHxoMUdE&feature=related
>
> Maybe that can help you understand the contexts and branches - it's pretty
> good

OK, Thanks

I setup a github account
I pushed my dependency subdirectory there
Here is the url if you want to have a look.
git@...:baho-utot/trinity.git

Now to begin work on the trinty git repo is the following coreect?

I have cloned the trinity repo with the pkgbuilds

Now I need to do this......

branch the repo with

git checkout -b wip

bend, break, fold and mutilate 

then to merge the changes etc into the master

git merge wip

then git branch -d wip

Is this correct?