Martin Ritchie wrote:
Why wouldn't you do the work on trunk and merge to M2?
On 16/03/07, Alan Conway <[EMAIL PROTECTED]> wrote:
Now that we've got an M2 branch I'll start merging. Be aware of what
you're committing and make sure it goes on the right branch.
If you have work that belongs on both, do it on M2 and use svnmerge.py
to merge it to the trunk.
The trunk will contain forward-looking changes that must not be merged
to M2. M2 will have minor fixes that will almost always also be
applicable to trunk. It's safe to merge M2->trunk but not the other way,
you might accidentally merge post-M2 changes that would wreck the M2
branch (e.g. 0-9 features.)
In general release branches should be treated more conservatively than
development branches: merging from is always more conservative than
merging to ;)
Cheers,
Alan.
