[Buildbot-commits] [buildbot/buildbot] 81ceb9: Clobber if workdir exists but isn't a git checkout...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: 81ceb910ad2fbf00b4e34fa696647856bd61a1bb
      https://github.com/buildbot/buildbot/commit/81ceb910ad2fbf00b4e34fa696647856bd61a1bb
  Author: Srinu P <srinupiits at gmail.com>
  Date:   2013-08-20 (Tue, 20 Aug 2013)

  Changed paths:
    M master/buildbot/process/buildstep.py
    M master/buildbot/steps/source/git.py
    M master/buildbot/test/unit/test_steps_source_gerrit.py
    M master/buildbot/test/unit/test_steps_source_git.py
    M master/docs/developer/master-slave.rst
    M slave/buildslave/commands/base.py
    M slave/buildslave/commands/fs.py
    M slave/buildslave/commands/registry.py
    M slave/buildslave/test/unit/test_commands_fs.py

  Log Message:
  -----------
  Clobber if workdir exists but isn't a git checkout. Fixes #2531


  Commit: f9fd8da29ef1456c743c97d47cdd841a2360a9bb
      https://github.com/buildbot/buildbot/commit/f9fd8da29ef1456c743c97d47cdd841a2360a9bb
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-11-17 (Sun, 17 Nov 2013)

  Changed paths:
    M master/buildbot/process/buildstep.py
    M master/buildbot/steps/source/git.py
    M master/buildbot/test/unit/test_steps_source_gerrit.py
    M master/buildbot/test/unit/test_steps_source_git.py
    M master/docs/developer/master-slave.rst
    M slave/buildslave/commands/base.py
    M slave/buildslave/commands/fs.py
    M slave/buildslave/commands/registry.py
    M slave/buildslave/test/unit/test_commands_fs.py

  Log Message:
  -----------
  Merge branch 'bug2531-sqash' of git://github.com/srinupiits/buildbot

Conflicts:
	master/buildbot/steps/source/git.py
	master/buildbot/test/unit/test_steps_source_git.py
	slave/buildslave/commands/base.py
	slave/buildslave/commands/registry.py
plus autopep8


Compare: https://github.com/buildbot/buildbot/compare/c474bc0aa826...f9fd8da29ef1