[Buildbot-commits] [buildbot/buildbot] bc3864: Make svn checkout op work on recreated branches.

[noreply at github.com]

Branch: refs/heads/master
Home:   https://github.com/buildbot/buildbot

Commit: bc38643fd3e573e2f5f1be85e6871eb2b8c896ad
    https://github.com/buildbot/buildbot/commit/bc38643fd3e573e2f5f1be85e6871eb2b8c896ad
Author: Robert Iannucci <riannucci at drjekyll.skyblue-technologies.com>
Date:   2010-12-08 (Wed, 08 Dec 2010)

Changed paths:
  M slave/buildslave/commands/svn.py
  M slave/buildslave/test/unit/test_commands_svn.py

Log Message:
-----------
Make svn checkout op work on recreated branches.

Svn's checkout command takes a --revision argument, but it only does
what buildbot expects if at the time of the checkout, the revision
specified is in the current line of history for that path. Otherwise the
--revision will cause the checked out path to become whatever that
current line of history was at that revision.

In other words, consider the following:
  * create trunk (r1)
  * create branch foo from trunk (r2)
  * delete foo (r3)
  * create branch foo from trunk (r4)

If at this point you do:
  * svn co --revision 2 .../branches/foo

Svn will look at the current line of history for branches/foo (@HEAD or
@4 in this case), and it will follow it backwards to the specified
revision (r2). The result will be TRUNK at r2. From then on, doing an
update operation will cause the working copy (on trunk) to update to the
latest version of trunk.

This patch adds the 'peg revision' so that when buildbot tries to check
out a branch at a given revision, it tells svn to find the line of
history for that branch at the specified revision. In the example above,
this would cause the checkout to contain foo as it was at r2. From then
on, update commands will continue to update the working copy on the same
path (update will not change the path of the working copy, only switch
will do that, which buildbot does not use)


Commit: 3b0ccf709fd8201af9f4375831c37b33039631ad
    https://github.com/buildbot/buildbot/commit/3b0ccf709fd8201af9f4375831c37b33039631ad
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date:   2010-12-08 (Wed, 08 Dec 2010)

Changed paths:
  M slave/buildslave/commands/svn.py
  M slave/buildslave/test/unit/test_commands_svn.py

Log Message:
-----------
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.