[
https://issues.apache.org/jira/browse/ACCUMULO-4620?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15966395#comment-15966395
]
Mike Walch commented on ACCUMULO-4620:
--------------------------------------
I made a single change in a 1.8 branch and applied to a master branch with my
change. The merge completed successfully but there was a warning.
{noformat}
$ git merge test-dir-1.8
Auto-merging
modules/core/src/main/java/org/apache/accumulo/core/util/Duration.java
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 2598
and retry the command.
Merge made by the 'recursive' strategy.
modules/core/src/main/java/org/apache/accumulo/core/util/Duration.java | 3 +++
1 file changed, 3 insertions(+)
{noformat}
Another potential issue is that this change can cause directories to stick
around as untracked files when switching between master & 1.8/1.7. This
wouldn't be the only change that is causing this but I am not sure how
comfortable developers are in using {{git clean}}.
While I am still for this change, I am OK delaying it until there is some more
consensus. Until then, I will close the PR but leave this issue open.
> Consolidate all Maven modules into one directory
> ------------------------------------------------
>
> Key: ACCUMULO-4620
> URL: https://issues.apache.org/jira/browse/ACCUMULO-4620
> Project: Accumulo
> Issue Type: Improvement
> Components: build
> Reporter: Mike Walch
> Assignee: Mike Walch
> Fix For: 1.7.4, 1.8.2, 2.0.0
>
> Time Spent: 1h 20m
> Remaining Estimate: 0h
>
> Currently, Accumulo has most of its Maven modules residing in the root
> directory and some modules in a {{server}} directory. It would be great if
> all Accumulo modules were consolidate into a {{modules}} directory to put
> every module in one directory and reduce the number of directories in the
> root project directory. To simplify merges in the future, this should also be
> done for {{1.8}} and {{1.7}} branches in addition to {{master}}.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
