Mailing-List: contact dev-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@accumulo.apache.org
MIME-Version: 1.0
Reply-To: vines@apache.org
In-Reply-To: 
 <CAFAMeYJ__Q4Bg19bkSAYav3XjOtjDrn8-yUwYK74DiOFjPZuZQ@mail.gmail.com>
References: <JIRA.12682501.1386101286231@arcas>
 <JIRA.12682501.1386101286231.66426.1392838582147@arcas>
 <CAD-fFUJqRTj1uaCU5a8+WGp4v3WKLRA8N_9VVxKgFiWv6rOmgA@mail.gmail.com>
 <CAFAMeYJ__Q4Bg19bkSAYav3XjOtjDrn8-yUwYK74DiOFjPZuZQ@mail.gmail.com>
From: John Vines <vines@apache.org>
Date: Wed, 19 Feb 2014 15:16:42 -0500
Message-ID: 
 <CADczPYSouj-GrekQuW=vAX5Q75OOsR+26DGYGiT9YiXnNV_FQQ@mail.gmail.com>
Subject: Re: [jira] [Commented] (ACCUMULO-1961) Fix trivial compiler/javadoc
 warnings
To: Accumulo Dev List <dev@accumulo.apache.org>
Content-Type: multipart/alternative; boundary=047d7b3438a88dae7e04f2c8132d

--047d7b3438a88dae7e04f2c8132d
Content-Type: text/plain; charset=ISO-8859-1

Yes you can. You need to do an orchestrated merge. What I do is merge up to
right before it with merge 1.5.1-SNAPSHOT~6 (6 commits behind head of
1.5.1-SNAPSHOT branch). Then I can do merge -s ours 1.5.1-SNAPSHOT~5 to
merge just that one commit with -s ours. And then I can do a merge
1.5.1-SNAPSHOT to merge the rest of the way normally.


On Wed, Feb 19, 2014 at 3:09 PM, Mike Drob <madrob@cloudera.com> wrote:

> 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.
> >
>

--047d7b3438a88dae7e04f2c8132d--