Dec. 4, 2008
11:31 p.m.
trunk ---> release26-maint \-> py3k ---> release30-maint
As a side-note: this merging flow means that bugfix and feature commits may never be merged from trunk to py3k in one svnmerge batch. Else, they cannot be separated when merging from py3k to 30-maint.
True. However, the same would be true for the merge flow 26 -> trunk -> 3.0 -> 3k In fact, that merge flow wouldn't support merging features *at all*: a feature added to trunk would need to flow through 3.0, which can't accept new features. Regards, Martin