accumulo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Christopher <ctubb...@apache.org>
Subject Re: [jira] [Commented] (ACCUMULO-1961) Fix trivial compiler/javadoc warnings
Date Wed, 19 Feb 2014 20:20:07 GMT
As Mike pointed out, you can't do it if there is unmerged parents. You
have to merge the parents first, then your commit. If there's any
commits which are children of the commit you want to merge with
-sours, you can single out your specific commit by referencing the
sha1 in the merge instead of the branch name. That will leave the
children unmerged, still, but will isolate your -sours to just that
commit. Then you can merge the remaining children in a separate merge.

--
Christopher L Tubbs II
http://gravatar.com/ctubbsii


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
View raw message