ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam StarTeamCheckout.java
Date Mon, 01 Sep 2003 09:53:05 GMT
bodewig     2003/09/01 02:53:05

  Modified:    docs/manual/OptionalTasks starteam.html
               src/main/org/apache/tools/ant/taskdefs/optional/starteam
                        StarTeamCheckout.java
  Log:
  label and lock/unlock cannot be used at the same time in <stcheckout>.
  
  PR: 22829
  Submitted by:	Steve Cohen <scohen at apache dot org>
  
  Revision  Changes    Path
  1.21      +2 -2      ant/docs/manual/OptionalTasks/starteam.html
  
  Index: starteam.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/starteam.html,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- starteam.html	7 Jul 2003 07:24:53 -0000	1.20
  +++ starteam.html	1 Sep 2003 09:53:05 -0000	1.21
  @@ -145,7 +145,7 @@
     </tr>
     <tr>
       <td valign="top">label</td>
  -    <td valign="top">Check out files as of this label.  The label must exist in starteam
or an exception will be thrown.  If not specified, the most recent version of each file will
be checked out.</td>
  +    <td valign="top">Check out files as of this label.  The label must exist in starteam
or an exception will be thrown.  If either <code>locked</code> or <code>unlocked</code>
is true, an exception will be thrown.  If not specified, the most recent version of each file
will be checked out.</td>
       <td align="center" valign="top">no</td>
     </tr>
     <tr>
  @@ -163,7 +163,7 @@
       <td valign="top">locked</td>
       <td valign="top">If true, file will be locked against changes by other 
   users.  If false (default) has no effect. 
  -    <td align="center" valign="center" rowspan="2">Either or neither, but not both,
may be true.</td>
  +    <td align="center" valign="center" rowspan="2">Either or neither, but not both,
may be true. Neither may be true if a <code>label</code> is specified.</td>
     </tr>
     <tr>
       <td valign="top">unlocked</td>
  
  
  
  1.21      +5 -0      ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java
  
  Index: StarTeamCheckout.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- StarTeamCheckout.java	19 Jul 2003 08:11:06 -0000	1.20
  +++ StarTeamCheckout.java	1 Sep 2003 09:53:05 -0000	1.21
  @@ -261,6 +261,11 @@
                   Project.MSG_WARN);
               this.createDirs = false;
           }
  +        if (lockStatus != Item.LockType.UNCHANGED && null != getLabel()) {
  +            log("Neither locked nor unlocked may be true when checking out a labeled version.",

  +                Project.MSG_ERR);
  +            throw new BuildException("Lock status may not be changed when checking out
a non-current version.");
  +        }
       }
   
       /**
  
  
  

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


Mime
View raw message