>> I have finished the merge of the main project, but please don't commit >> nowhere into the main project (turnk, branches, ...) until told otherwise >> >> The diff between the trunk and branch seems to make absolutely sense now. >> >> What I propose is to copy the branch (4.4) to the trunk and keep the current >> trunk as a tag (magnolia-5.0-prototype1). I feels wrong to continue the >> development based on the prototype where we have many hacks, workarounds >> and hidden todos. The code which is valuable can be refetched from the >> prototype tag at any point and time. >> >> This guarantees: >> - proper svn history on the trunk >> - current 5.0 code undergoes a review >> - helps to reconsider our doing and apply what we have learned while >> prototyping >> - no commit to the trunk without jira ticket
After all I am going to: - copy the current trunk to a tag (magnolia-5.0-poc1) - copy the 4.4 branch as new trunk - change pom/module descriptor so that the trunk is the new 5.0 (but based on the current 4.4) Commits are again going to the trunk (not to magnolia-4.4 branch anymore), where ever it makes sense the changes are backported to the branches (4.4, 4.3, ..) ---------------------------------------------------------------- For list details see http://www.magnolia-cms.com/home/community/mailing-lists.html To unsubscribe, E-mail to: <[email protected]> ----------------------------------------------------------------
