On Sat, Jan 29, 2011 at 02:08:29PM -0800, The Web Maestro wrote: > Are you saying you think we should consider: > a) moving from SVN to GIT
I was careful not to make that suggestion. Such a move implies much more than merging. This has been discussed in the ASF and was rejected for now. The most important issue is the possibility to pull anyone's code changes. Apache projects must have a good overview of the provenance of their code; all code contributions must fall under a Copyright License Agreement with the ASF. It is not yet clear how that can be achieved with GIT. Every committer can decide for himself to use GIT via Apache's GIT mirror at https://github.com/apache/fop or http://git.apache.org/, and commit via git-svn. See http://www.apache.org/dev/git.html and http://wiki.apache.org/general/GitAtApache. As always, every committer must make sure that he commits his own code or code which was contributed to the ASF, via patches in bugzilla. > b) using GIT as a timesaver for conflicts? That is up to every developer himself. I just note the possibility to do so, and my good experience with it. Simon > Clay > > Sent from my iPhone > > On Jan 29, 2011, at 12:24 PM, Simon Pepping <spepp...@leverkruid.eu> wrote: > > > I read in the literature that GIT and Mercurial merge would be very > > much better at resolving possible conflicts than subversion. Today I > > tested this with the merge of the Temp_Color branch into trunk. > > > > In GIT I used the GIT repository at https://github.com/apache/fop. The > > merge of Temp_Color resulted in one conflict, in status.xml. The > > conflict was presented precisely, and was easily resolved. > > > > The merge in Subversion resulted in the following: > > > > Summary of conflicts: > > Text conflicts: 16 > > Property conflicts: 1 > > Tree conflicts: 68 > > > > The many tree conflicts were files that were removed in the branch and > > trunk or added in both. Obviously they were caused by the merges of > > trunk into Temp_Color earlier. > > > > After the merge in GIT I got no compilation errors. I got three > > failures in the junit tests, which were also present in the branch. I > > investigated a few cases which gave a conflict in subversion. They > > were resolved correctly in GIT. > > > > This merge result is a huge time saver, and I thought I should let you > > know. > > > > Simon > > > > On Wed, Jan 19, 2011 at 11:56:34AM +0100, Jeremias Maerki wrote: > >> I've cleaned up the color branch, tweaked a few things and did some more > >> testing. I'm happy with the current state, so I'm calling for a vote to > >> merge the current FOP color branch into trunk. > >> > >> https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_Color > >> > >> +1 from me, obviously. > >> > >> Jeremias Maerki > >>
