@Freeland, Scott,
I have an oddball case where I have been using GIT in my project, but not
GIT-SVN. In fact, I didn't even have the 'svn' version of git installed
until I hit this bump trying to run tests.
The task mistakenly thinks that commands like git svn info will work. My
proposes solution to this is to add an additional check for a '.git/svn'
directory.
(Patch attached vs r5261)
--
Eric Z. Ayers - GWT Team - Atlanta, GA USA
http://code.google.com/webtoolkit/
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
Index: build-tools/ant-gwt/src/com/google/gwt/ant/taskdefs/SvnInfo.java
===================================================================
--- build-tools/ant-gwt/src/com/google/gwt/ant/taskdefs/SvnInfo.java (revision 5261)
+++ build-tools/ant-gwt/src/com/google/gwt/ant/taskdefs/SvnInfo.java (working copy)
@@ -168,7 +168,11 @@
dir = dir.getAbsoluteFile();
while (dir != null) {
if (new File(dir, ".git").isDirectory()) {
- return true;
+ File svndir = new File(dir.getPath() + File.pathSeparator + ".git", "svn");
+ if (svndir.isDirectory()) {
+ return true;
+ }
+ return false;
}
dir = dir.getParentFile();
}
