Merging unicode

Merging unicode

[Juanma Barranquero]

Assuming 22.1 is released in the next few days, what is the status and
timeline with respect to merging the emacs-unicode-2 branch to the
trunk?

             Juanma

Re: Merging unicode

[Andreas Schwab]

"Juanma Barranquero" <lekktu@gmail.com> writes:

> Assuming 22.1 is released in the next few days, what is the status and
> timeline with respect to merging the emacs-unicode-2 branch to the
> trunk?

I don't think there is any interlock between the 22.1 release and the
unicode-2 merge.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: Merging unicode

[Juanma Barranquero]

On 5/29/07, Andreas Schwab <schwab@suse.de> wrote:

> I don't think there is any interlock between the 22.1 release and the
> unicode-2 merge.

I got the impression that people was refraining from doing large-scale
changes to the trunk to facilitate testing patches in the trunk before
moving them to the EMACS_22_BASE branch.

But if I'm wrong, what is delaying the merge of the unicode branch?

             Juanma

Re: Merging unicode

[David Kastrup]

"Juanma Barranquero" <lekktu@gmail.com> writes:

> On 5/29/07, Andreas Schwab <schwab@suse.de> wrote:
>
>> I don't think there is any interlock between the 22.1 release and the
>> unicode-2 merge.
>
> I got the impression that people was refraining from doing large-scale
> changes to the trunk to facilitate testing patches in the trunk before
> moving them to the EMACS_22_BASE branch.
>
> But if I'm wrong, what is delaying the merge of the unicode branch?

Well, that the jury is somewhat out on the multi-tty branch.  I had
made some proposals with regard to environment variables, but if I am
going to do them myself, I will need at least one or two weekends.
Then there is the matter of non-existing Texinfo information for the
Elisp manual and also the Emacs manual.

Merging unicode2 first will cause synch headaches in the multitty
branch (larger than the other way round, presumably).  However, Károly
had already agreed he'd do the synch work for unicode-2 if that is
synched first.  And we really should not wait all too long with
multi-tty since the available manpower means that it would likely be a
bad idea to have extensive package updates (tramp, gnus, whatever)
before we have basically merged all the branches we want in.  But it
also does not make much sense to merge in multi-tty before we have
arrived at a variable/terminal/environment model that has either a
solid chance for being the final model (in which case we will have to
do changes to other stuff just once) or is minimally invasive (in
which case we can keep most current stuff and probably make decisions
about changes, if any, later).

We currently still have some bug fixes trundling in.  Applying them to
both EMACS_22_BASE and trunk is easier before the unicode-2 synch.

But on the other hand, Emacs 22.1 is in its final throws.  Synching
unicode-2 will make parallel updates of EMACS_22_BASE and trunk a bit
more inconvenient.  And maybe we just need that bit of inconvenience
to shoo Emacs 22.1 out the door.

-- 
David Kastrup, Kriemhildstr. 15, 44793 Bochum

Re: Merging unicode

[Jason Rumney]

David Kastrup wrote:
> Merging unicode2 first will cause synch headaches in the multitty
> branch (larger than the other way round, presumably).

I don't know why you presume this. The same two versions will be being
merged, and the same conflicts produced. The branch in CVS where the
work takes place to resolve the conflicts is the only variable.

Re: Merging unicode

[David Kastrup]

Jason Rumney <jasonr@gnu.org> writes:

> David Kastrup wrote:
>> Merging unicode2 first will cause synch headaches in the multitty
>> branch (larger than the other way round, presumably).
>
> I don't know why you presume this. The same two versions will be being
> merged, and the same conflicts produced.

But the work will be done by different sets of people.

-- 
David Kastrup, Kriemhildstr. 15, 44793 Bochum

Re: Merging unicode

[Juanma Barranquero]

On 5/29/07, David Kastrup <dak@gnu.org> wrote:

> Well, that the jury is somewhat out on the multi-tty branch.

OTOH the unicode branch is ready to be merged.

> Then there is the matter of non-existing Texinfo information for the
> Elisp manual and also the Emacs manual.

Why should that affect the merge? We're not going to release 23.1 any time soon.

> Merging unicode2 first will cause synch headaches in the multitty
> branch (larger than the other way round, presumably).

I agree with Jason: the conflicts are the same, the only thing that
varies is where do they happen and who shoulders the effort.

> But on the other hand, Emacs 22.1 is in its final throws.  Synching
> unicode-2 will make parallel updates of EMACS_22_BASE and trunk a bit
> more inconvenient.  And maybe we just need that bit of inconvenience
> to shoo Emacs 22.1 out the door.

It's an option to ponder... :)

             Juanma


-- 
What is this talk of "release"? Klingons do not make software
"releases". Our software "escapes" leaving a bloody trail of designers
and quality assurance people in its wake.
                                    -- The Klingon Programmer

Re: Merging unicode

[Jason Rumney]

Juanma Barranquero wrote:
> I agree with Jason: the conflicts are the same, the only thing that
> varies is where do they happen and who shoulders the effort.

I disagree that "who shoulders the effort" varies though. The merge
needs collaboration between people familiar with the code in both
branches to figure out how to best solve any problems that come up.

Re: Merging unicode

[Juanma Barranquero]

On 5/30/07, Jason Rumney <jasonr@gnu.org> wrote:

> I disagree that "who shoulders the effort" varies though. The merge
> needs collaboration between people familiar with the code in both
> branches to figure out how to best solve any problems that come up.

That depends, I think, on whether branch A is merged to the trunk, and
then B is merged immediately, or A is merged to the trunk, B
synchronized one or more times with the trunk, and then merged some
time afterwards. You talk about the problems, and I'm thinking more of
the footwork of maintaining branches more or less synchronized, even
if the number of conflicts is low.

Whatever the case, I think we should merge the unicode branch ASAP.

             Juanma

Re: Merging unicode

[Richard Stallman]

    Assuming 22.1 is released in the next few days, what is the status and
    timeline with respect to merging the emacs-unicode-2 branch to the
    trunk?

The main question is whether to merge emacs-unicode-2 or multy-tty
first.  Once 22.1 is released, we can merge a few changes into the 22
branch as described in FOR-RELEASE.  Then it would be good to merge
those two branches as soon as that can feasibly be done.