Merge branch 'svn_checkout_fix' of git://github.com/riannucci/buildbot

* 'svn_checkout_fix' of git://github.com/riannucci/buildbot: Make svn checkout op work on recreated branches.
buildbot · Dec 8, 2010 · 3b0ccf7 · 3b0ccf7
2 parents 04b4e3d + bc38643
commit 3b0ccf7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/slave/buildslave/commands/svn.py b/slave/buildslave/commands/svn.py
@@ -76,7 +76,7 @@ def doVCUpdate(self):
 
     def doVCFull(self):
         revision = self.args['revision'] or 'HEAD'
-        args = ['--revision', str(revision), self.svnurl, self.srcdir]
+        args = ['--revision', str(revision), "%s@%s" % (self.svnurl, str(revision)), self.srcdir]
 
         if self.mode == 'export':
             if revision == 'HEAD': return self.doSVNExport()

diff --git a/slave/buildslave/test/unit/test_commands_svn.py b/slave/buildslave/test/unit/test_commands_svn.py
@@ -35,7 +35,7 @@ def test_simple(self):
                 self.basedir)
                 + 0,
             Expect([ 'path/to/svn', 'checkout', '--non-interactive', '--no-auth-cache',
-                     '--revision', 'HEAD', 'http://svn.local/app/trunk', 'source' ],
+                     '--revision', 'HEAD', 'http://svn.local/app/trunk@HEAD', 'source' ],
                 self.basedir,
                 sendRC=False, timeout=120, usePTY=False, environ=exp_environ)
                 + 0,