You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by ga...@apache.org on 2012/06/05 17:47:31 UTC
svn commit: r1346437 -
/xmlgraphics/commons/branches/commons-1_5rc1/status.xml
Author: gadams
Date: Tue Jun 5 15:47:31 2012
New Revision: 1346437
URL: http://svn.apache.org/viewvc?rev=1346437&view=rev
Log:
Merge remote-tracking branch 'origin/trunk' into commons-1_5rc1
Modified:
xmlgraphics/commons/branches/commons-1_5rc1/status.xml
Modified: xmlgraphics/commons/branches/commons-1_5rc1/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/commons-1_5rc1/status.xml?rev=1346437&r1=1346436&r2=1346437&view=diff
==============================================================================
--- xmlgraphics/commons/branches/commons-1_5rc1/status.xml (original)
+++ xmlgraphics/commons/branches/commons-1_5rc1/status.xml Tue Jun 5 15:47:31 2012
@@ -42,6 +42,9 @@
Fix corner cases involving long/double conversion and rounding error in double division when rounding 5E-N for certain N.
</action>
<action context="Code" dev="GA" type="update" fixes-bug="53327" due-to="Julien Aymé">
+ Fix corner cases involving long/double conversion and rounding error in double division when rounding 5E-N for certain N.
+ </action>
+ <action context="Code" dev="GA" type="update" fixes-bug="53327" due-to="Julien Aymé">
Fix determination of use of precise vs fast formatting in order to fix regression with value 5.22534294505995E-4, decimals: 17, precision: 17.
</action>
<action context="Code" dev="GA" type="fix" fixes-bug="53352" importance="high">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org
Re: svn commit: r1346437 - /xmlgraphics/commons/branches/commons-1_5rc1/status.xml
Posted by Glenn Adams <gl...@skynav.com>.
On Wed, Jul 4, 2012 at 7:06 AM, Vincent Hennebert <vh...@gmail.com>wrote:
> Glenn,
>
> On 05/06/12 16:47, gadams@apache.org wrote:
> > Author: gadams
> > Date: Tue Jun 5 15:47:31 2012
> > New Revision: 1346437
> >
> > URL: http://svn.apache.org/viewvc?rev=1346437&view=rev
> > Log:
> > Merge remote-tracking branch 'origin/trunk' into commons-1_5rc1
>
> Please use Subversion and not Git to merge branches. You are free to use
> Git behind the scenes if you wish to, but that must remain totally
> transparent as far as the Apache repository is concerned.
>
> In the present case we have no way of knowing which version of trunk has
> been merged into the branch. Also, the svn:mergeinfo property hasn’t
> been updated on the root directory, which will create trouble next time
> we update the branch to the latest trunk. Subversion will try to merge
> changes that have already been merged by Git and this will result into
> a lot of conflicts.
>
I am using the git-svn techniques prescribed by
http://wiki.apache.org/general/GitAtApache.
Re: svn commit: r1346437 - /xmlgraphics/commons/branches/commons-1_5rc1/status.xml
Posted by Vincent Hennebert <vh...@gmail.com>.
Glenn,
On 05/06/12 16:47, gadams@apache.org wrote:
> Author: gadams
> Date: Tue Jun 5 15:47:31 2012
> New Revision: 1346437
>
> URL: http://svn.apache.org/viewvc?rev=1346437&view=rev
> Log:
> Merge remote-tracking branch 'origin/trunk' into commons-1_5rc1
Please use Subversion and not Git to merge branches. You are free to use
Git behind the scenes if you wish to, but that must remain totally
transparent as far as the Apache repository is concerned.
In the present case we have no way of knowing which version of trunk has
been merged into the branch. Also, the svn:mergeinfo property hasn’t
been updated on the root directory, which will create trouble next time
we update the branch to the latest trunk. Subversion will try to merge
changes that have already been merged by Git and this will result into
a lot of conflicts.
Thanks,
Vincent
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: general-help@xmlgraphics.apache.org