Re: Reconsidering the work flow and how the SCM system fits in

[Koen Kooi <koen@dominion.kabel.utwente.nl>]

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

Graeme Gregory schreef:
|> Nice, your argumentation is pretty convincing. I just guess that we're
|> going to have lots of "I'd love to see branches in OE" votes in this
|> thread, and I'd just love to see them treated separately from "I need
|> branches", "I'm ok with using branches for my changes", "Branches are
|> going to complicate my work, but I might try", and "I hate branches -
|> I already barely have time to do real work" votes.
|>
|
| I need branches.

Heh, I feel an "told you so" moment coming. The 'frozen revision'
approach could have more easily been a branch with no changes (except
for the branchpoint) that you or John only update (mtn propagate
org.openembedde.dev org.openmoko.lag) when you think .dev is buildable.
And it would also have been a natural place to stash things like your
qtopia stuff.

| I need to be able to have an openmoko branch which follows .dev closely
| but has some stuff that hasnt reached QA level required to allow in
| .dev yet.
|
| I probably need the openmoko branch to be only served by the openmoko
| servers.
|
| What I don't know is how this works with monotone, and I haven't had
| time to sit down with the manual and trial it.

The q&d way:

* create a local diff by editing or adding a file
* commit -b org.openmoko.needmorebru
* checkout the branch into a new dir: mtn co -b org.openmoko.needmorebru
* go wild in that branch
* track .dev: mtn propagate org.openembedded.dev org.openmoko.needmorebru

and once the stuff reached a good QA point:

mtn propagate org.openmoko.needmorebru org.openembedded.dev

That what stelios and I did with the avr32 branch and it works great.
The thing that stops the branch from being unmergable is the regular
propagate from .dev to org.openmoko.needmorebru.

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFH1mEPMkyGM64RGpERAkaDAJ0ZptVecmhKw+yLg3/j7I7I9YVo4ACfSpkB
aCJd/THz7BPIHwcH/5Ns2SI=
=m7A8
-----END PGP SIGNATURE-----