ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jan.Mate...@rzf.fin-nrw.de
Subject RE: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Import Task.java
Date Wed, 14 Apr 2004 14:46:33 GMT
or do the  cvs up -j/commit  and check the commit-mail,
like me at this moment (faq) - it´s cheaper if you have only
mobile access...


Jan

> -----Original Message-----
> From: Peter Reilly [mailto:peter.reilly@corvil.com]
> Sent: Wednesday, April 14, 2004 4:46 PM
> To: Ant Developers List
> Subject: Re: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs
> ImportTask.java
> 
> 
> There are a number of techinques
> 
> for a single file with only changes in the HEAD that need to 
> go to the 
> 1.6 branch:
> Check out the 1.6 branch using cvs co ant -r  ANT_16_BRANCH
> cd to the directory in question
> and do cvs update -j HEAD ImportTask.java
> this updates the working file.
> do cvs diff ImportTask.java
> to make sure that the changes are ok
> and then do commit ImportTask.java
> 
> Peter
> 
> Matt Benson wrote:
> 
> >And once again I escape having to merge anything....
> >I'm really going to have to learn to do that before
> >1.6.2... :(
> >
> >-Matt
> >
> >--- peterreilly@apache.org wrote:
> >  
> >
> >>peterreilly    2004/04/14 01:21:35
> >>
> >>  Modified:   
> >>src/main/org/apache/tools/ant/taskdefs Tag:
> >>ANT_16_BRANCH
> >>                        ImportTask.java
> >>  Log:
> >>  sync with HEAD - optional attribute and verbose
> >>skip log
> >>  
> >>  Revision  Changes    Path
> >>  No                   revision
> >>  No                   revision
> >>  1.16.2.10 +2 -2     
> >>
> >>    
> >>
> >ant/src/main/org/apache/tools/ant/taskdefs/ImportTask.java
> >  
> >
> >>  
> >>  Index: ImportTask.java
> >> 
> >>
> >>    
> >>
> >===================================================================
> >  
> >
> >>  RCS file:
> >>
> >>    
> >>
> >/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ImportTa
> sk.java,v
> >  
> >
> >>  retrieving revision 1.16.2.9
> >>  retrieving revision 1.16.2.10
> >>  diff -u -r1.16.2.9 -r1.16.2.10
> >>  --- ImportTask.java	9 Mar 2004 17:01:33 -0000
> >>1.16.2.9
> >>  +++ ImportTask.java	14 Apr 2004 08:21:35 -0000
> >>1.16.2.10
> >>  @@ -66,7 +66,7 @@
> >>        *                 default is false
> >>        */
> >>       public void setOptional(boolean optional) {
> >>  -        this.optional = true;
> >>  +        this.optional = optional;
> >>       }
> >>   
> >>       /**
> >>  @@ -136,7 +136,7 @@
> >>           if (importStack.contains(importedFile)) {
> >>               getProject().log(
> >>                   "Skipped already imported file:\n
> >>  "
> >>  -                + importedFile + "\n",
> >>Project.MSG_WARN);
> >>  +                + importedFile + "\n",
> >>Project.MSG_VERBOSE);
> >>               return;
> >>           }
> >>   
> >>  
> >>  
> >>  
> >>
> >>
> >>    
> >>
> >---------------------------------------------------------------------
> >  
> >
> >>To unsubscribe, e-mail:
> >>dev-unsubscribe@ant.apache.org
> >>For additional commands, e-mail:
> >>dev-help@ant.apache.org
> >>
> >>    
> >>
> >
> >
> >
> >	
> >		
> >__________________________________
> >Do you Yahoo!?
> >Yahoo! Tax Center - File online by April 15th
> >http://taxes.yahoo.com/filing.html
> >
> >---------------------------------------------------------------------
> >To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
> >For additional commands, e-mail: dev-help@ant.apache.org
> >
> >
> >
> >  
> >
> 
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
> For additional commands, e-mail: dev-help@ant.apache.org
> 

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message