Rahul Akolkar wrote: > On Fri, Aug 27, 2010 at 6:06 AM, Luc Maisonobe <luc.maison...@free.fr> wrote: >> Le 27/08/2010 00:37, 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.
Yes, my strong recommendation is to just check out the 2_X branch and port changes to the checkout, then commit. The merge command using local paths can be helpful, but diffs should be observed and tests run on the local 2_X (or trunk) checkout before committing. Phil > > -Rahul > > >> You can also use svn.eu.apache.org if you happen to use the european >> mirror of the subversion repository. >> >> Luc >> > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org > For additional commands, e-mail: dev-h...@commons.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org For additional commands, e-mail: dev-h...@commons.apache.org