> -----Original Message----- > From: Brett Porter [mailto:[EMAIL PROTECTED] > Sent: vendredi 30 décembre 2005 19:00 > To: [email protected] > Subject: Re: svn commit: r360120 - /maven/components/trunk/maven-artifact- > manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManage > r.java > > We don't need to manually apply fixes to both the trunk and branch. > > I know its been a bit slow due to the break, but we will do regular > branch -> trunk merges.
I thought the plan was to do the opposite: always check in on trunk and merge on branches! At least this is the recommendation Jason got from everyone out there. > (Unless there is some other plan - I haven't read through that dev > process doc that is being formulated yet). Yep, see above :-) -Vincent > [EMAIL PROTECTED] wrote: > > Author: vmassol > > Date: Fri Dec 30 09:14:54 2005 > > New Revision: 360120 > > > > URL: http://svn.apache.org/viewcvs?rev=360120&view=rev > > Log: > > Error while deploying when using scpexe protocol with non-default > scp/ssh executables > > PR: MNG-1900 > > Submitted By: Brett Porter > > > > Modified: > > maven/components/trunk/maven-artifact- > manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManage > r.java > > > > Modified: maven/components/trunk/maven-artifact- > manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManage > r.java > > URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven- > artifact- > manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManage > r.java?rev=360120&r1=360119&r2=360120&view=diff > > > ========================================================================== > ==== > > --- maven/components/trunk/maven-artifact- > manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManage > r.java (original) > > +++ maven/components/trunk/maven-artifact- > manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManage > r.java Fri Dec 30 09:14:54 2005 > > @@ -317,6 +317,8 @@ > > try > > { > > wagon = getWagon( protocol ); > > + > > + configureWagon( wagon, repository ); > > } > > catch ( UnsupportedProtocolException e ) > > { > > > > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] ___________________________________________________________________________ Nouveau : téléphonez moins cher avec Yahoo! Messenger ! Découvez les tarifs exceptionnels pour appeler la France et l'international. Téléchargez sur http://fr.messenger.yahoo.com --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
