Skip to Content.
Sympa Menu

sm-grimoire - Re: [SM-Grimoire]Ok, let's clear up how we are to use devel -> test again...

sm-grimoire AT lists.ibiblio.org

Subject: Discussion of Spells and Grimoire items

List archive

Chronological Thread  
  • From: Tony Smith <tony AT smee.org>
  • To: Ladislav Hagara <hgr AT vabo.cz>, eschabell AT sourcemage.org
  • Cc: sm-grimoire AT lists.ibiblio.org
  • Subject: Re: [SM-Grimoire]Ok, let's clear up how we are to use devel -> test again...
  • Date: Mon, 14 Oct 2002 11:16:23 +0100

On Monday 14 October 2002 11:04 am, Ladislav Hagara wrote:
> Howdy !!!
>
> > 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
>
> So, if I have made change only in test grimoire (I thought, after 1.0 we
copy 1.0
> grimoire to devel), I should do
> p4 integrate //sgl/test/grimoire/crypto/... //sgl/devel/grimoire/crypto/...
> p4 resolve
> p4 submit

Yup. Exactly so.

Tony





Archive powered by MHonArc 2.6.24.

Top of Page