Commit 5e25c1fe authored by Mitar's avatar Mitar
Browse files

Merge branch 'branch-out-of-date-message' into 'master'

Check non-primitive files match upstream

Closes #339

See merge request !190
parents 18a80ae9 6f2df634
Pipeline #116678053 passed with stages
in 87 minutes and 49 seconds
......@@ -1044,6 +1044,9 @@ else:
if arguments.devel:
files_changed = filter_for_devel(files_changed)
if any(not os.path.relpath(file_path).startswith('v') for file_path in file_changed):
raise ValidationError("There are non-primitive file changes between your branch and upstream. If you have not authored those changes, you need to update your branch with upstream.")
error_count = 0
installations = collections.defaultdict(list)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment