Title: [40558] trunk/hudson/plugins/subversion/src/main/java/hudson/scm: Bug fix in the 1.40-RC.
- Revision
- 40558
- Author
- kohsuke
- Date
- 2012-05-08 13:06:39 -0400 (Tue, 08 May 2012)
Log Message
Bug fix in the 1.40-RC.
- debug code had crept in that was forcing v1.6 working copy during the checkout
- we need to resync from the master before using the SubversionWorkspaceSelector.workspaceFormat value
Modified Paths
Diff
Modified: trunk/hudson/plugins/subversion/src/main/java/hudson/scm/SubversionSCM.java (40557 => 40558)
--- trunk/hudson/plugins/subversion/src/main/java/hudson/scm/SubversionSCM.java 2012-05-07 20:29:34 UTC (rev 40557)
+++ trunk/hudson/plugins/subversion/src/main/java/hudson/scm/SubversionSCM.java 2012-05-08 17:06:39 UTC (rev 40558)
@@ -830,7 +830,6 @@
* (and properly remoted, if the svn operations run on slaves.)
*/
public static SvnClientManager createClientManager(ISVNAuthenticationProvider authProvider) {
- SubversionWorkspaceSelector.syncWorkspaceFormatFromMaster();
ISVNAuthenticationManager sam = createSvnAuthenticationManager(authProvider);
return new SvnClientManager(SVNClientManager.newInstance(createDefaultSVNOptions(), sam));
}
Modified: trunk/hudson/plugins/subversion/src/main/java/hudson/scm/SvnClientManager.java (40557 => 40558)
--- trunk/hudson/plugins/subversion/src/main/java/hudson/scm/SvnClientManager.java 2012-05-07 20:29:34 UTC (rev 40557)
+++ trunk/hudson/plugins/subversion/src/main/java/hudson/scm/SvnClientManager.java 2012-05-08 17:06:39 UTC (rev 40558)
@@ -26,6 +26,7 @@
public SvnClientManager(SVNClientManager core) {
this.core = core;
+ SubversionWorkspaceSelector.syncWorkspaceFormatFromMaster();
wcgen = SubversionWorkspaceSelector.workspaceFormat>=SubversionWorkspaceSelector.WC_FORMAT_17 ? SvnWcGeneration.V17 : SvnWcGeneration.V16;
}
Modified: trunk/hudson/plugins/subversion/src/main/java/hudson/scm/subversion/CheckoutUpdater.java (40557 => 40558)
--- trunk/hudson/plugins/subversion/src/main/java/hudson/scm/subversion/CheckoutUpdater.java 2012-05-07 20:29:34 UTC (rev 40557)
+++ trunk/hudson/plugins/subversion/src/main/java/hudson/scm/subversion/CheckoutUpdater.java 2012-05-08 17:06:39 UTC (rev 40558)
@@ -66,7 +66,6 @@
@Override
public List<External> perform() throws IOException, InterruptedException {
final SVNUpdateClient svnuc = clientManager.getUpdateClient();
- svnuc.getOperationsFactory().setPrimaryWcGeneration(SvnWcGeneration.V16);
final List<External> externals = new ArrayList<External>(); // store discovered externals to here
listener.getLogger().println("Cleaning local Directory " + location.getLocalDir());
