diff options
author | Stefan Granitz <stefan.graenitz@gmail.com> | 2019-07-22 09:47:40 +0000 |
---|---|---|
committer | Stefan Granitz <stefan.graenitz@gmail.com> | 2019-07-22 09:47:40 +0000 |
commit | 3a52e50d737905ff7da2747f27d61ca331ad6081 (patch) | |
tree | 8ed13b24d656bbd214af840009e3ca5a9f8e0fda /llvm/utils | |
parent | 88559637641e993895337e1047a0bd787fecc647 (diff) | |
download | bcm5719-llvm-3a52e50d737905ff7da2747f27d61ca331ad6081.tar.gz bcm5719-llvm-3a52e50d737905ff7da2747f27d61ca331ad6081.zip |
Add location of SVN staging dir to git-llvm error output
Summary:
In pre-monorepo times the svn staging directory was `.git/svn`. The below error message wasn't mentioning the new name yet.
Example before:
```
Can't push git rev 104cfa289d9 because svn status is not empty:
! llvm/trunk/include/llvm
```
Example after:
```
Can't push git rev 104cfa289d9 because status in svn staging dir (.git/llvm-upstream-svn) is not empty:
! llvm/trunk/include/llvm
```
Reviewers: mehdi_amini, jlebar, teemperor
Reviewed By: mehdi_amini
Subscribers: llvm-commits, #llvm
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65038
llvm-svn: 366671
Diffstat (limited to 'llvm/utils')
-rwxr-xr-x | llvm/utils/git-svn/git-llvm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/utils/git-svn/git-llvm b/llvm/utils/git-svn/git-llvm index 289898d15b5..763bcbec9bb 100755 --- a/llvm/utils/git-svn/git-llvm +++ b/llvm/utils/git-svn/git-llvm @@ -312,8 +312,8 @@ def svn_push_one_rev(svn_repo, rev, git_to_svn_mapping, dry_run): status = svn(svn_repo, 'status', '--no-ignore') if status: - die("Can't push git rev %s because svn status is not empty:\n%s" % - (rev, status)) + die("Can't push git rev %s because status in svn staging dir (%s) is " + "not empty:\n%s" % (rev, svn_repo, status)) svn_dirs_to_update = set() for sr, files in iteritems(subrepo_files): |