accumulo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Mike Drob <mad...@cloudera.com>
Subject Re: [jira] [Commented] (ACCUMULO-1961) Fix trivial compiler/javadoc warnings
Date Wed, 19 Feb 2014 20:09:02 GMT
Bah!

I was writing a response on the JIRA, and then saw this after I hit submit.
The short of it is that I don't think you can do a merge of just specific
commits, because part of what makes a commit unique is it's parent commit.
So to merge in something, you necessarily must merge it's entire lineage as
well.

There is an operation for pulling commits out of their history, and it is
called cherry-picking, but I refuse to provide detail or instruction for
the obvious reasons. Somebody with more git knowledge can come by and
augment this answer if necessary.

Mike


On Wed, Feb 19, 2014 at 3:03 PM, Bill Havanki <bhavanki@clouderagovt.com>wrote:

> Popping this out of JIRA since I am changing the subject somewhat.
>
> Christopher (or anyone, really): Can you give me an example of doing a
> merge with -sours but only with specific commits, as recommended? It makes
> sense that this is safer vs. sweeping in HEAD. Just trying to refine my
> workflow. Thanks!
>
> Bill
>
> ---------- Forwarded message ----------
> From: Christopher Tubbs (JIRA) <jira@apache.org>
> Date: Wed, Feb 19, 2014 at 2:36 PM
> Subject: [jira] [Commented] (ACCUMULO-1961) Fix trivial compiler/javadoc
> warnings
> To: notifications@accumulo.apache.org
>
>     [
>
> https://issues.apache.org/jira/browse/ACCUMULO-1961?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13905940#comment-13905940
> ]
>
> Christopher Tubbs commented on ACCUMULO-1961:
> ---------------------------------------------
>
> It looks like you are right. Be careful about -sours. You should probably
> only use that with specific commits, not the HEAD of the branch, which
> could reference multiple commits.
>
> Don't worry about fixing it. I'll redo. There's some other javadoc
> errors/warnings and other trivial warnings in master that need to be fixed
> anyway.
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message