[PATCH] D65038: Add location of SVN staging dir to git-llvm error output

[Stefan Gränitz via Phabricator via llvm-commits]

sgraenitz created this revision.
sgraenitz added reviewers: mehdi_amini, jlebar, teemperor.
Herald added a project: LLVM.

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


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D65038

Files:
  llvm/utils/git-svn/git-llvm


Index: llvm/utils/git-svn/git-llvm
===================================================================
--- llvm/utils/git-svn/git-llvm
+++ llvm/utils/git-svn/git-llvm
@@ -312,8 +312,8 @@
 
     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):


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D65038.210953.patch
Type: text/x-patch
Size: 581 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190720/f52380de/attachment.bin>