[Buildbot-commits] [buildbot/buildbot] 318aac: (port from eight) recover from the SVN operation b...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: 318aac48b2c38be1af43d16b2d742915894353d3
      https://github.com/buildbot/buildbot/commit/318aac48b2c38be1af43d16b2d742915894353d3
  Author: Mark Rowe <mrowe at apple.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M master/buildbot/steps/source/svn.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  (port from eight) recover from the SVN operation being interrupted

* in case 'svn info' returns 'E155037' (run 'cleanup' if it was
  interrupted), clobber the checkout

See ticket:3053

Conflicts:
	master/buildbot/steps/source/svn.py
	master/docs/relnotes/index.rst


  Commit: daca7bc98dcb2dd1ca2545247a599a4620b043e1
      https://github.com/buildbot/buildbot/commit/daca7bc98dcb2dd1ca2545247a599a4620b043e1
  Author: Mikhail Sobolev <mss at mawhrin.net>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M master/buildbot/steps/source/svn.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Merge pull request #1371 from sa2ajj/port-fix-3053

(port from eight) recover from the SVN operation being interrupted


Compare: https://github.com/buildbot/buildbot/compare/d527f19ac820...daca7bc98dcb