Author: jkf
Date: Sat Jan  7 12:14:22 2006
New Revision: 366902

URL: http://svn.apache.org/viewcvs?rev=366902&view=rev
Log:
PR35852: Committed changes provided by Benjamin Burgess

Modified:
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java?rev=366902&r1=366901&r2=366902&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java Sat Jan  7 12:14:22 2006
@@ -529,7 +529,7 @@
                 log("Checking out: " + describeCheckout(eachFile));
                 break;
             default:
-                if (isForced()) {
+                if (isForced() && fileStatus != Status.CURRENT) {
                     log("Forced checkout of "
                         + describeCheckout(eachFile)
                         + " over status " + Status.name(fileStatus));
@@ -550,7 +550,7 @@
                     }
                 }
                 eachFile.checkout(this.lockStatus,
-                                 !this.useRepositoryTimeStamp, this.convertEOL, true);
+                                 !this.useRepositoryTimeStamp, this.convertEOL, false);
             }
         }
     }

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java?rev=366902&r1=366901&r2=366902&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java Sat Jan  7 12:14:22 2006
@@ -574,7 +574,8 @@
                 String[] props = new String[] {pn.FILE_NAME, pn.FILE_PATH,
                                                pn.FILE_STATUS, pn.MODIFIED_TIME,
                                                pn.FILE_FILE_TIME_AT_CHECKIN,
-                                               pn.MODIFIED_USER_ID, pn.FILE_SIZE};
+                                               pn.MODIFIED_USER_ID, pn.FILE_SIZE,
+                                               pn.FILE_ENCODING};
 
                 int depth = this.isRecursive() ? -1 : 0;
                 starteamrootfolder.populateNow(getServer().getTypeNames().FILE,



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