sm-grimoire AT lists.ibiblio.org
Subject: Discussion of Spells and Grimoire items
List archive
Re: [SM-Grimoire]Ok, let's clear up how we are to use devel -> test again...
- From: "M.L." <mlubrano AT sourcemage.org>
- To: Ryan Abrams <rabrams AT sourcemage.org>, eschabell AT sourcemage.org
- Cc: sm-grimoire AT lists.ibiblio.org, Tony Smith <tony AT smee.org>
- Subject: Re: [SM-Grimoire]Ok, let's clear up how we are to use devel -> test again...
- Date: Mon, 14 Oct 2002 19:35:31 +0200
On Lundi 14 Octobre 2002 13:34, Ryan Abrams wrote:
> Eric,
>
> I didn't really read this, so if i am mistaken in this comment, ignore.
>
> I just want to make sure you dont spend too much time teaching people
> devel->test in perforce, considering that in a month or so, we are
> gonna move the gurus off perforce entirely, with perforce only sticking
> around for you and tony to maintain test/stable.
>
No more p4 for guru's ? Too bad, I don't like that, I prefer p4... (never
managed to make cvs updates, with a nice GUI like p4web client...
> That said, you were probably just addressing some problem you saw. Just
> wanted to double check.
>
> -Ryan
>
> On Monday, October 14, 2002, at 03:54 AM, Eric Schabell wrote:
> > Howdy all!
> >
> > For the perforce users under us, the following will allow us to keep
> > devel up
> > to date while you also push changes into test correctly (with
> > history), see
> > this note from tony:
> >
> > ************************************************
> > Here's a tip for the future. When you have made changes in devel that
> > you
> > also want to appear in test, you can (should) use "p4 integrate" and
> > "p4
> > resolve" rather than manually copying the files manually between the
> > branches. For example...
> >
> > p4 integrate //sgl/devel/grimoire/editors/...
> > //sgl/test/grimoire/editors/...
> > p4 resolve
> > p4 submit
> >
> > It's a lot less prone to error than manually copying the files. For the
> > details, check out:
> >
> > http://www.perforce.com/perforce/doc.021/manuals/p4guide/
> > 05_conflicts.html#10
> > 41981
> >
> > http://www.perforce.com/perforce/doc.021/manuals/p4guide/
> > 09_branching.html#1
> > 043880
> >
> > Heavy going, but worth it. If you have any trouble doing it, then I can
> > either offer advice.
> > ************************************************
> >
> > so let's keep the braches in sync ok?
> >
> > Cvs users can keep on editing the cvs grimoire, and let me know what
> > is avail
> > as fixes to be applied to test... the easiest way is either e-mail me
> > or add
> > this to the cvs comments when you commit (something like: PULL THIS
> > FIX TO
> > TEST / DON'T PULL) as I see all the cvs mail....
> >
> > Hope this helps!
> >
> > --
> > /*
> > * drs. Eric Schabell
> > * web: http://www.schabell.com
> > * SourceMage: http://www.sourcemage.org
> > * Shopping: http://www.cafeshops.com/cp/store.aspx?s=sourcemage.0
> > * irc.openprojects.org (#sourcemage)
> > * nick -> erics
> > */
> >
> > _______________________________________________
> > SM-Grimoire mailing list
> > SM-Grimoire AT lists.ibiblio.org
> > http://lists.ibiblio.org/mailman/listinfo/sm-grimoire
>
> _______________________________________________
> SM-Grimoire mailing list
> SM-Grimoire AT lists.ibiblio.org
> http://lists.ibiblio.org/mailman/listinfo/sm-grimoire
--
//
// M.L.
// Linux User #36502 ; ICQ #23832402
//
-
[SM-Grimoire]Ok, let's clear up how we are to use devel -> test again...,
Eric Schabell, 10/14/2002
-
Re: [SM-Grimoire]Ok, let's clear up how we are to use devel -> test again...,
Ladislav Hagara, 10/14/2002
- Re: [SM-Grimoire]Ok, let's clear up how we are to use devel -> test again..., Tony Smith, 10/14/2002
-
Re: [SM-Grimoire]Ok, let's clear up how we are to use devel -> test again...,
Ryan Abrams, 10/14/2002
- Re: [SM-Grimoire]Ok, let's clear up how we are to use devel -> test again..., M.L., 10/14/2002
-
Re: [SM-Grimoire]Ok, let's clear up how we are to use devel -> test again...,
Ladislav Hagara, 10/14/2002
Archive powered by MHonArc 2.6.24.