Merging Practices

[Mike Drob <md...@mdrob.com>]

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

Re: Merging Practices

[Christopher <ct...@apache.org>]

The 1.4 modules don't merge properly to 1.5. So long as we're certain
that everything has been merged correctly and there isn't any actual
changes to make, we could do:

foreach <subdirectory> in branches/1.4.3/src/*
  svn merge -r 1:HEAD --record-only branches/1.4/src/<subdirectory>
branches/1.5/<subdirectory>

Record-only merges will update the merge history to reflect the fact
that these directories are up-to-date. After that, a regular merge
from branches/1.5/ to trunk/ should go cleanly.

This may also help the transition to git.

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


On Sun, Jul 7, 2013 at 11:08 AM, Mike Drob <md...@mdrob.com> wrote:
> Well, there are no changes to the future branches, so "just merging"
> involves no action. I guess I'll just leave the merge-info as is until Git
> happens and then we can just slap in a few merge commits.
>
>
> On Sat, Jul 6, 2013 at 8:53 PM, Josh Elser <jo...@gmail.com> wrote:
>
>> 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" <md...@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 <jo...@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" <md...@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
>> > > >
>> > >
>> >
>>

Re: Merging Practices

[Mike Drob <md...@mdrob.com>]

Well, there are no changes to the future branches, so "just merging"
involves no action. I guess I'll just leave the merge-info as is until Git
happens and then we can just slap in a few merge commits.


On Sat, Jul 6, 2013 at 8:53 PM, Josh Elser <jo...@gmail.com> wrote:

> 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" <md...@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 <jo...@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" <md...@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
> > > >
> > >
> >
>

Re: Merging Practices

[Josh Elser <jo...@gmail.com>]

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" <md...@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 <jo...@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" <md...@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
> > >
> >
>

Re: Merging Practices

[Mike Drob <md...@mdrob.com>]

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 <jo...@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" <md...@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
> >
>

Re: Merging Practices

[Josh Elser <jo...@gmail.com>]

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" <md...@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
>