Re: [VOTE] Merge FOP color branch into trunk

2011-01-29 Thread Simon Pepping
I get three failures on the color branch junit tests: java version 1.6.0_18 OpenJDK Runtime Environment (IcedTea6 1.8.3) (6b18-1.8.3-2) OpenJDK Server VM (build 16.0-b13, mixed mode) OS: GNU/Linux (Debian testing) [echo] Apache Ant version 1.8.0 compiled on March 11 2010 [echo] VM: 16.0-b13, Sun

Re: [VOTE] Merge FOP color branch into trunk

2011-01-29 Thread Simon Pepping
I paid a little attention to the conditions determining the type of ColorSpace, and came up with some questions: GraphicsSetProcessColor(Color color): Would it be possible to implement and use ColorSpace.getNumComponents() instead of hard coding the number of components here?

Subversion merge or GIT merge? [was: Re: [VOTE] Merge FOP color branch into trunk]

2011-01-29 Thread Simon Pepping
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

Re: Subversion merge or GIT merge? [was: Re: [VOTE] Merge FOP color branch into trunk]

2011-01-29 Thread The Web Maestro
Are you saying you think we should consider: a) moving from SVN to GIT b) using GIT as a timesaver for conflicts? 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