accumulo-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Christopher Tubbs (JIRA)" <j...@apache.org>
Subject [jira] [Updated] (ACCUMULO-2927) Make 'git clean -df' sufficient when switching between branches
Date Thu, 19 Jun 2014 15:58:24 GMT

     [ https://issues.apache.org/jira/browse/ACCUMULO-2927?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]

Christopher Tubbs updated ACCUMULO-2927:
----------------------------------------

    Attachment: 0002-ACCUMULO-2927-Add-.gitignore-for-mapreduce-and-shell.patch
                0001-ACCUMULO-2927-More-targeted-git-ignores-per-module.patch

Here's a solution that makes git ignores more targeted (per module) so that we don't run into
this situation again by having too many or too few global ignores at the root when modules
change.

[^0001-ACCUMULO-2927-More-targeted-git-ignores-per-module.patch] should be applied to 1.6.1-SNAPSHOT
branch, then merged to master, after which [^0002-ACCUMULO-2927-Add-.gitignore-for-mapreduce-and-shell.patch]
can be applied to master to get the new modules.

> Make 'git clean -df' sufficient when switching between branches
> ---------------------------------------------------------------
>
>                 Key: ACCUMULO-2927
>                 URL: https://issues.apache.org/jira/browse/ACCUMULO-2927
>             Project: Accumulo
>          Issue Type: Improvement
>          Components: build
>    Affects Versions: 1.6.0
>            Reporter: Bill Havanki
>            Assignee: Bill Havanki
>            Priority: Minor
>             Fix For: 1.6.1, 1.7.0
>
>         Attachments: 0001-ACCUMULO-2927-More-targeted-git-ignores-per-module.patch, 0002-ACCUMULO-2927-Add-.gitignore-for-mapreduce-and-shell.patch,
ACCUMULO-2927-1.6.v1.patch.txt, ACCUMULO-2927-master.v1.patch.txt
>
>
> Update .gitignore across the active development branches so that, upon switching from
one branch containing build artifacts to another, it is enough to run {{git clean -df}} (and
{{mvn clean}}) to remove leftovers from the prior branch and successfully build. Requiring
{{git clean -xdf}} leads to the destruction of IDE tracking files.
> For background, see [this email thread|http://mail-archives.apache.org/mod_mbox/accumulo-dev/201406.mbox/%3CCAGHyZ6JXBNpgH8nrA_sE9ss8NXAE7Se_Ob%3DBuxZaFA098bg_2Q%40mail.gmail.com%3E].



--
This message was sent by Atlassian JIRA
(v6.2#6252)

Mime
View raw message