Re: [O] Merge 9.0.5 to emacs master?

[Kaushal Modi]

On Mon, Feb 13, 2017, 1:40 PM Kyle Meyer  wrote:

> Rasmus  writes:
>
> [...]
>
> > I think we have discussed it before, but the best way seems to just copy
> > the Org tree to the Emacs tree, right?
>
> Given the current setup, I think copying the files is best.  I've
> already resolved the conflicts when backporting Org-related commits from
> the Emacs repo.
>

Just a minor nudge.

If I understand correctly, everyone is in agreement that the org maint
branch should be merged into emacs master branch now.

This issue came up recently in an emacs-devel discussion.

I don't have experience merging mega branches, but I can help in any other
way in that direction.

> --

Kaushal Modi

Re: [O] Merge 9.0.5 to emacs master?

[Kyle Meyer]

Rasmus  writes:

[...]

> I think we have discussed it before, but the best way seems to just copy
> the Org tree to the Emacs tree, right?

Given the current setup, I think copying the files is best.  I've
already resolved the conflicts when backporting Org-related commits from
the Emacs repo.

-- 
Kyle

Re: [O] Merge 9.0.5 to emacs master?

[Rasmus]

Kyle Meyer  writes:

> Hi Bastien,
>
> Bastien Guerry  writes:
>
>> Kyle Meyer  writes:
>>
>>> Kaushal Modi  writes:
>>>
 Kyle -- Would this be a good time to start the merge to emacs master?
>>>
From my standpoint, that'd be fine.  I'm not aware of any outstanding
>>> patches that need to be backported from the Emacs repo.
>>
>> Before undertaking this, we need to make sure the Emacs maintainers
>> are fine with it -- I'm late in reading the related discussions.
>>
>> Can you wait a few days for my "go" ?
>
> I'll do better than that and wait indefinitely since the plan isn't for
> me to do the syncing :)

I also haven't caught up with all the messages about sync the "new" plans.
AFAIR Eli said to go ahead in one of the early messages.

> I also mentioned [*2*] that I had created a branch, emacs-sync, in the
> Org repo that contains a few extra changes that I think are appropriate
> for the sync.  That branch is up-to-date with 9.0.5.

I think we have discussed it before, but the best way seems to just copy
the Org tree to the Emacs tree, right?

Rasmus

-- 
Summon the Mothership!

Re: [O] Merge 9.0.5 to emacs master?

[Kyle Meyer]

Hi Bastien,

Bastien Guerry  writes:

> Kyle Meyer  writes:
>
>> Kaushal Modi  writes:
>>
>>> Kyle -- Would this be a good time to start the merge to emacs master?
>>
>>>From my standpoint, that'd be fine.  I'm not aware of any outstanding
>> patches that need to be backported from the Emacs repo.
>
> Before undertaking this, we need to make sure the Emacs maintainers
> are fine with it -- I'm late in reading the related discussions.
>
> Can you wait a few days for my "go" ?

I'll do better than that and wait indefinitely since the plan isn't for
me to do the syncing :)

To give a bit more context to Kaushal's question, when he asked the list
previously [*1*] about syncing 9.0.4 with the Emacs repo, I replied
[*2*, *3*] that we should wait for the next release because there were
Emacs commits that still needed to be backported, as well as white space
touch-ups that were needed in order for the Org files to pass Emacs's
pre-commit check.

I also mentioned [*2*] that I had created a branch, emacs-sync, in the
Org repo that contains a few extra changes that I think are appropriate
for the sync.  That branch is up-to-date with 9.0.5.


[*1*] https://lists.gnu.org/archive/html/emacs-orgmode/2017-01/msg00551.html
[*2*] https://lists.gnu.org/archive/html/emacs-orgmode/2017-01/msg00571.html
[*3*] https://lists.gnu.org/archive/html/emacs-orgmode/2017-01/msg00584.html

-- 
Kyle

Re: [O] Merge 9.0.5 to emacs master?

[Bastien Guerry]

Hi Kyle,

Kyle Meyer  writes:

> Kaushal Modi  writes:
>
>> Kyle -- Would this be a good time to start the merge to emacs master?
>
>>From my standpoint, that'd be fine.  I'm not aware of any outstanding
> patches that need to be backported from the Emacs repo.

Before undertaking this, we need to make sure the Emacs maintainers
are fine with it -- I'm late in reading the related discussions.

Can you wait a few days for my "go" ?

Thanks,

-- 
 Bastien

Re: [O] Merge 9.0.5 to emacs master? (Was: Release 9.0.5)

[Kyle Meyer]

Kaushal Modi  writes:

> Kyle -- Would this be a good time to start the merge to emacs master?

>From my standpoint, that'd be fine.  I'm not aware of any outstanding
patches that need to be backported from the Emacs repo.

-- 
Kyle