Branch: refs/heads/eight
Home: https://github.com/buildbot/buildbot
Commit: c9cf4b12f90f3b77e0235176df6253da5a818148
https://github.com/buildbot/buildbot/commit/c9cf4b12f90f3b77e0235176df6253da5a818148
Author: Cody P Schafer <[email protected]>
Date: 2015-02-03 (Tue, 03 Feb 2015)
Changed paths:
M master/buildbot/steps/source/git.py
M master/buildbot/test/unit/test_steps_source_git.py
M master/docs/relnotes/index.rst
Log Message:
-----------
git: force submodule update so local changes/files are overwritten
Without this, we sometimes get "Your local changes to the following
files would be overwritten by checkout" when submodules are updates.
On the non-submodule side, we're already using reset instead of
checkout to avoid this.
Signed-off-by: Cody P Schafer <[email protected]>
Conflicts:
master/docs/relnotes/index.rst
Commit: bf3fa43cbceecebbc90d0b05e561f6495ff98f3c
https://github.com/buildbot/buildbot/commit/bf3fa43cbceecebbc90d0b05e561f6495ff98f3c
Author: Mikhail Sobolev <[email protected]>
Date: 2015-02-03 (Tue, 03 Feb 2015)
Changed paths:
M master/buildbot/steps/source/git.py
M master/buildbot/test/unit/test_steps_source_git.py
M master/docs/relnotes/index.rst
Log Message:
-----------
Merge pull request #1520 from sa2ajj/backport-1167
git: force submodule update so local changes/files are overwritten
Compare:
https://github.com/buildbot/buildbot/compare/ec0f5a2f7e6a...bf3fa43cbcee------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Buildbot-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/buildbot-commits
