Mailing-List: contact dev-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@accumulo.apache.org
Received-SPF: pass (athena.apache.org: domain of josh.elser@gmail.com
 designates 209.85.214.170 as permitted sender)
MIME-Version: 1.0
In-Reply-To: 
 <CAJRvFdo5jsh_WcGfJnqPgv4t12tCdMyYzNyLd-i_GgTC0a0kig@mail.gmail.com>
References: 
 <CAJRvFdr8EX=M3CkNc=a4b6Cb5aeYwRWSE4xnP2p9TCpyU3YV9Q@mail.gmail.com>
	<CAOyNEs5vk2VuVA9zQeMSuB0vTJkhpRCXR=60L+pg=EbpQTvaRQ@mail.gmail.com>
	<CAJRvFdo5jsh_WcGfJnqPgv4t12tCdMyYzNyLd-i_GgTC0a0kig@mail.gmail.com>
Date: Sat, 6 Jul 2013 20:53:20 -0400
Message-ID: 
 <CAOyNEs4cFi7fsp2K_p_ceU54q9RpySZTRydQ_LEaBMnvJLYRZQ@mail.gmail.com>
Subject: Re: Merging Practices
From: Josh Elser <josh.elser@gmail.com>
To: dev@accumulo.apache.org
Content-Type: multipart/alternative; boundary=089e01538afcb5366804e0e15a5c

--089e01538afcb5366804e0e15a5c
Content-Type: text/plain; charset=UTF-8

Well, at one point 1:HEAD was clean, but since i don't remember when that
was, it was probably a while ago :P

I don't think it would be out of line to just merge your changes. Probably
not a huge deal with the Git switchover (hopefully) imminent.
On Jul 6, 2013 6:57 PM, "Mike Drob" <mdrob@mdrob.com> wrote:

> Thanks Josh, that helped me start in the right direction.
>
> Going from 1.4 src/core to 1.5 core, I'm getting a ton of conflicts along
> the way. Since this commit _should_ be a no-op on 1.5, I'm safe just doing
> a "mine-full" on everything, right? I'm starting to think that doing a
> merge of "1:HEAD" might be too wide of a range.
>
>
> On Sat, Jul 6, 2013 at 6:05 PM, Josh Elser <josh.elser@gmail.com> wrote:
>
> > I believe all you need to do by hand is to merge src/${module} in 1.4 to
> > ${module} in 1.5. You just can't merge 1.4 directly in 1.5.
> >
> > 1.5 to trunk should be straightforward.
> > On Jul 6, 2013 4:37 PM, "Mike Drob" <mdrob@mdrob.com> wrote:
> >
> > > I tested and committed the patch for ACCUMULO-895 and am currently
> trying
> > > to update the svn mergeinfo into 1.5 and trunk. The bottom note tells
> me
> > > that I should ask the dev list for details and help merging, so here I
> am
> > > asking. I currently have conflicts for src/server and src/core and no
> > idea
> > > how to resolve them.
> > >
> > > Mike
> > >
> >
>

--089e01538afcb5366804e0e15a5c--