Re: patch to merge gui-release to default

[Rik]

On 01/30/2015 01:14 PM, address@hidden wrote:

Subject:

Re: Keeping the gui-release branch open considered harmful

From:

"John W. Eaton" <address@hidden>

Date:

01/30/2015 01:13 PM

To:

Rik <address@hidden>, address@hidden

List-Post:

<mailto:address@hidden>

Precedence:

list

MIME-Version:

1.0

References:

<address@hidden> <address@hidden> <address@hidden> <address@hidden> <address@hidden>

In-Reply-To:

<address@hidden>

Message-ID:

<address@hidden>

Content-Type:

multipart/mixed; boundary="------------020802080609020206000803"

Message:

7

On 01/30/2015 03:48 PM, John W. Eaton wrote:

On 01/30/2015 12:59 PM, Rik wrote:

Yes, it's a bit of a pickle either way.

Yeah.  Well, it would be simpler if we could just work on one feature at
a time and make releases when each feature is complete.  :-)

You seemed to have much better
luck than I did quickly generating the backout changesets so maybe
that is
the way to go.  I didn't see the file NEWS in the diff, so maybe that has
to be manually modified to reflect what has been kept and what has not.

Oh, yeah, of course.  The reason it didn't show up in the diff that I
generated is because it was not modified at the same time as the
functions were removed, so that is a separate changeset to backout.

I
also like to put the version number when a function was deprecated in the
m-file in scripts/deprecated/*.m.  Those should be changed to 4.0 instead
of 4.2.

OK, I missed that too, but will fix it.  Thanks.

I'm attaching an updated patch.  I also fixed the version number in configure.ac.

Seems fine.   I found a typo in NEWS and I updated the deprecation comment strings in scripts/directory/*.m to 4.0 from 4.2.  This is probably like pulling off a band-aid, i.e., we want to do it quickly and cleanly.  Maybe one more round of pulling from stable->gui-release->default to make sure we gather up everything  and then apply your changeset.  Then the branch can be closed so that we don't accidentally commit to it.

See attached diffs which incorporate my changes with your original patch.

--Rik

deprecated.diffs
Description: Text document