[Dev] Branch or not branch for wx incremental integration

[Heikki Toivonen]

Philippe Bossut wrote:
> (c)- do the incremental updates on a wx branch and merge post 0.6 (and
> pay a continuous extra maintenance cost during the 0.6 debug phase...)

I vote for c). However, that still leaves a couple of options open as to
how to do this. One is to branch the whole tree. The other is to branch
just the internal/wx directory (need a relver scheme to identify the
branch binaries). That way David would be on the trunk for all other
stuff except wx automatically. Any wx fix that made it to the trunk
would have to be ported to the branch. In the beginning of 0.7 we would
merge the branch to trunk (most likely overwriting all trunk changes in
case of conflict).

-- 
  Heikki Toivonen

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 253 bytes
Desc: OpenPGP digital signature
Url : http://lists.osafoundation.org/pipermail/dev/attachments/20051019/031fc6d7/signature.pgp