You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@hive.apache.org by Nick Dimiduk <nd...@gmail.com> on 2014/07/23 23:27:48 UTC

conf/hive-default.xml.template conflict-central

Hi there,

I've noticed that the above-mentioned file has become a constant source of
conflicts when applying patches. Is it possible to remove it from source
control and depend on the build process to generate it locally? This
appears to be what's happening anyway.

Thanks,
Nick

Re: conf/hive-default.xml.template conflict-central

Posted by Nick Dimiduk <nd...@gmail.com>.

Thanks Lefty.


On Wed, Jul 23, 2014 at 2:42 PM, Lefty Leverenz <le...@gmail.com>
wrote:

> Interesting idea, Nick.  How about adding it to the discussion
> <
> https://issues.apache.org/jira/browse/HIVE-6037?focusedCommentId=14061647&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-14061647
> >
> on HIVE-6037?
>
> -- Lefty
>
>
> On Wed, Jul 23, 2014 at 5:27 PM, Nick Dimiduk <nd...@gmail.com> wrote:
>
> > Hi there,
> >
> > I've noticed that the above-mentioned file has become a constant source
> of
> > conflicts when applying patches. Is it possible to remove it from source
> > control and depend on the build process to generate it locally? This
> > appears to be what's happening anyway.
> >
> > Thanks,
> > Nick
> >
>

Re: conf/hive-default.xml.template conflict-central

Posted by Lefty Leverenz <le...@gmail.com>.

Interesting idea, Nick.  How about adding it to the discussion
<https://issues.apache.org/jira/browse/HIVE-6037?focusedCommentId=14061647&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-14061647>
on HIVE-6037?

-- Lefty

On Wed, Jul 23, 2014 at 5:27 PM, Nick Dimiduk <nd...@gmail.com> wrote:

> Hi there,
>
> I've noticed that the above-mentioned file has become a constant source of
> conflicts when applying patches. Is it possible to remove it from source
> control and depend on the build process to generate it locally? This
> appears to be what's happening anyway.
>
> Thanks,
> Nick
>