commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Luc Maisonobe <Luc.Maison...@free.fr>
Subject Re: svn commit: r989543 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
Date Fri, 27 Aug 2010 17:14:22 GMT
Le 27/08/2010 18:16, Gilles Sadowski a écrit :
>>>>>> MATH-410
>>>>>> Wrong variable ("argument" instead of "arguments").
>>>>>>
>>>>>> Modified:
>>>>>>     commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
>>>>>
>>>>> Could this be also put in the new MATH_2_X branch ?
>>>>
>>>> Certainly, but I don't know how to do it. :-}
>>>
>>> Either you can check out the MATH_2_X branch and do the change here
>>> again or if you are already sure the file should be exactly the same in
>>> both versions you can copy it directly in the repository with a command
>>> like:
>>>
>>> svn cp -m "the commit message you want"
>>> https://svn.apache.org/repos/asf/commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
>>> https://svn.apache.org/repos/asf/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
>>>
>> <snip/>
>>
>> The files may be identical, but their svn histories no longer are --
>> which means no server side copies please.
> 
> To avoid changing by hand files that should be the same in both location,
> isn't there some "merge" command?

There is one, look at the subversion book for exact syntax of the
command
<http://svnbook.red-bean.com/en/1.5/svn-book.html#svn.ref.svn.c.merge>.

Luc

> 
> Gilles
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
> For additional commands, e-mail: dev-help@commons.apache.org
> 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org


Mime
View raw message