Skip to Content.
Sympa Menu

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

sm-discuss AT lists.ibiblio.org

Subject: Public SourceMage Discussion List

List archive

Chronological Thread  
  • From: Seth Alan Woolley <seth AT positivism.org>
  • To: Tony Smith <tony AT smee.org>
  • Cc: sm-discuss AT lists.ibiblio.org
  • Subject: Re: [SM-Discuss] Branches getting out of sync...
  • Date: Fri, 11 Jun 2004 16:26:48 -0700

On Fri, Jun 11, 2004 at 02:29:10PM +0100, Tony Smith wrote:
> 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

This is great, now I know what to do when I have to edit test and stable
directly. I was always confused and it's nice to know that different
accepts have semantic meaning.

Seth

--
Seth Alan Woolley [seth at positivism.org], SPAM/UCE is unauthorized
Key id EF10E21A = 36AD 8A92 8499 8439 E6A8 3724 D437 AF5D EF10 E21A
http://smgl.positivism.org:11371/pks/lookup?op=get&search=0xEF10E21A
Security Team Leader Source Mage GNU/Linux http://www.sourcemage.org

Attachment: pgprbuJ7YMXEh.pgp
Description: PGP signature




Archive powered by MHonArc 2.6.24.

Top of Page