[
https://issues.apache.org/jira/browse/TINKERPOP-1493?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15690326#comment-15690326
]
ASF GitHub Bot commented on TINKERPOP-1493:
-------------------------------------------
Github user spmallette commented on the issue:
https://github.com/apache/tinkerpop/pull/457
good to know they both work. i sorta figured `merge` would be ok in this
case as github would just figure out the diff and only include his one commit.
when we merged that to our stuff, it wouldn't mess up history as it came from a
fork. though i wonder if merge would bring an ugly "merge" commit with it. if
it did, then i was wrong and `git rebase` would have been the way to go.
@pauljackson since @robertdale confirmed that `git rebase` is good,
perhaps you should go that route to keep our history neat.
> Groovy project doesn't build on Windows
> ---------------------------------------
>
> Key: TINKERPOP-1493
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1493
> Project: TinkerPop
> Issue Type: Bug
> Components: groovy
> Affects Versions: 3.2.2
> Reporter: Paul Jackson
> Assignee: Jason Plurad
> Priority: Minor
>
> Builds on Windows fail for two reasons. First the line to create extTestDir
> is creating a path consisting of two full paths concatenated together. The
> second drive letter is seen as an illegal character:
> {code}private static final File extTestDir = new
> File(System.getProperty("user.dir"),
> TestHelper.makeTestDataDirectory(DependencyGrabberTest.class));{code}
> Second, when it comes time to delete the directory it is locked. This is
> because some instances of JarFile are created on it but not closed.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
