On 15/11/2012 08:46, Jan Bernhardt wrote: > Hi Francesco, > > I was also wondering of what would be the best way to handle our multi-branch > development to finally merge back to trunk. And merging from trunk to > branches as often as possible is surely a best practice to avoid big gabs > between these development branches. > But in this case (CXF Port) I would rather not merge back and forward. My > plan would be to use our CXF branch as a Proof of Concept (PoC) branch and > not merge this branch back to trunk once everything is working. Instead I > would rather make changes in trunk directly (in a stable/consistent manner) > after solving all minor and major issues that might appear during the PoC.
Jan, as I've told below to Colm, you are somehow "owner" of the CXF branch, hence if you don't like much that to be kept in sync with the trunk, for me it is absolutely fine. > Does our Syncope project also provides a Git repository? I usually prefer > SVN, but especially when it comes to branch development SVN has some major > drawbacks compared to Git. SVN is not capable of merging files that are > renamed or moved to another directory (but this usually happens during major > refactoring activities), Git however is capable of tracking these changes and > is still able to do a good job when merging trank and branches back and > forwards. Syncope does not own any git repository at the ASF. I actually don't have much experience in merging large stuff with git - but I do have this with SVN: here's why I actually prefer to keep branches in sync as much as possible ;-) Regards. >> -----Original Message----- >> From: Francesco Chicchiriccò [mailto:[email protected]] >> Sent: Mittwoch, 14. November 2012 11:21 >> To: [email protected] >> Subject: Re: svn commit: r1409117 - in /incubator/syncope/branches/cxf: ./ >> archetype/src/main/resources/archetype-resources/core/ console/ >> console/src/main/resources/ core/ >> core/src/main/java/org/apache/syncope/core/init/ >> core/src/main/java/org/apache/syncope/c... >> >> On 14/11/2012 10:59, Colm O hEigeartaigh wrote: >>> Hi Francesco, >>> >>> Is it really necessary to merge this change to the CXF branch? IMO >>> it's probably best to keep the branch "clean" from when it was forked, >>> so that it's easier to merge back to trunk when the task is complete. >> Hi Colm, >> not sure of this: I actually thought that it was easier to keep the CXF >> branch >> updated with trunk rather than accumulating differences, in order to have an >> easier merge at the end. >> >> Anyway, if you believe so I'd avoid this for the future. >> >> Regards. -- Francesco Chicchiriccò ASF Member, Apache Cocoon PMC and Apache Syncope PPMC Member http://people.apache.org/~ilgrosso/
