Skip to Content.
Sympa Menu

sm-discuss - [SM-Discuss] Branches getting out of sync...

sm-discuss AT lists.ibiblio.org

Subject: Public SourceMage Discussion List

List archive

Chronological Thread  
  • From: Tony Smith <tony AT smee.org>
  • To: sm-discuss AT lists.ibiblio.org
  • Subject: [SM-Discuss] Branches getting out of sync...
  • Date: Fri, 11 Jun 2004 14:29:10 +0100

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Folks,

I've noticed recently that our devel/test and stable branches are diverging
somewhat. This is mostly down to two things:

1. The process not being clear
2. People using the wrong "p4 resolve" options

I've put up a Wiki page at:

http://wiki.sourcemage.org/index.php?page=PerforceChanges

to try to combat these problems, so please take the time to read it if you
submit changes to anything other than the devel branch (of sorcery or
grimoires).

It's a draft, so if there are things you want on there or I've made a mess of
it, let me know.

The main thing is that if you make a change in test or stable, you really
need
to integrate that change back down to devel - even if you use "Accept Yours"
to "ignore" the change in devel and keep what you've already got.

I'll be trying to bring things back into line over the next few days.

Tony
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFAybOpqu4dCYpCBl0RAinoAKCuAfwruKGacjEM63nU9P7aGFFWMgCfeYLV
4HCnx3/B6BHgLdE9ytuOxLY=
=0qqk
-----END PGP SIGNATURE-----




Archive powered by MHonArc 2.6.24.

Top of Page