Skip to Content.
Sympa Menu

sm-grimoire - [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: Eric Schabell <eschabell AT sourcemage.org>
  • To: sm-grimoire AT lists.ibiblio.org
  • Cc: Tony Smith <tony AT smee.org>
  • Subject: [SM-Grimoire]Ok, let's clear up how we are to use devel -> test again...
  • Date: Mon, 14 Oct 2002 10:54:23 +0200

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
*/





Archive powered by MHonArc 2.6.24.

Top of Page