xmlgraphics-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Vincent Hennebert <vhenneb...@gmail.com>
Subject Re: svn commit: r1346437 - /xmlgraphics/commons/branches/commons-1_5rc1/status.xml
Date Wed, 04 Jul 2012 13:06:33 GMT

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.


To unsubscribe, e-mail: general-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: general-help@xmlgraphics.apache.org

View raw message