id	summary	reporter	owner	description	type	status	milestone	component	version	severity	resolution	keywords	cc
10150	Regression testing can fail if you've modified files	Niklas Angare <li51ckf02@…>	René Rivera	"regression.py fails if you have local changes to files that are modified by a new commit, at least if they're under tools_bb. I had a patch_boost that had modified tools_bb/src/tools/testing.jam on the previous run when this occured.

Here's the output:
{{{
# Getting Boost.Build v2...
# Executing GIT command: /extra/boost_regression/ARM/tools_bb> git remote ""set-branches"" ""--add"" ""origin"" ""develop""
# Executing GIT command: /extra/boost_regression/ARM/tools_bb> git pull ""--recurse-submodules""
error: Your local changes to the following files would be overwritten by merge:
        src/tools/testing.jam
Please, commit your changes or stash them before you can merge.
Aborting
Updating 59fd3b6..708ceaf
}}}

Here's what git status showed:
{{{
On branch develop
Your branch is behind 'origin/develop' by 1 commit, and can be fast-forwarded.
  (use ""git pull"" to update your local branch)

Changes not staged for commit:
  (use ""git add <file>..."" to update what will be committed)
  (use ""git checkout -- <file>..."" to discard changes in working directory)

        modified:   src/tools/testing.jam

Untracked files:
  (use ""git add <file>..."" to include in what will be committed)

        src/tools/testing.jam.rej

no changes added to commit (use ""git add"" and/or ""git commit -a"")
}}}
"	Bugs	new	To Be Determined	Regression Testing USE GITHUB	Boost Development Trunk	Problem