I was going to change trac issues that have the fixedinstaging keyword
to be fixed in master, but many of these issues are also fixed in
2.2.2-staging. What should these issues be marked as? I'm assuming
fixedinstable is reserved for commits to 2.2.1?
Scott
signature.asc
Description: PGP signatu
On 05/26/2016 09:17 PM, Uwe Stöhr wrote:
> Am 26.05.2016 um 16:07 schrieb Uwe Stöhr:
>
>> everything is now ready. Please put the new installer for LyX 2.1.4 to
>> the ftp server:
>> http://ftp.lyx.de/LyX%202.1.4/
>
> I uploaded there version a new version 7 of the installer for 2.1.4 to
> avoid co
With 2.2.0 having been released, we are back to a more normal
development model.
The master branch is now open for normal development work toward 2.3.0,
with a tentative release date of November. ;-) The old 2.3-staging
branch has been merged into master. I'll plan to delete 2.3-staging
completel
On 05/28/2016 05:41 AM, Jürgen Spitzmüller wrote:
> Am Samstag, den 28.05.2016, 05:30 -0400 schrieb Scott Kostyshak:
>> To branch 2.2.x can't we always do
>>
>> git branch 2.2.x 2.2.0
>>
>> regardless of whether 2.3-staging was merged into master?
> You're right, I didn't think of that possibility.
Am Samstag, 28. Mai 2016 um 17:36:14, schrieb Kornel Benko
...
>
> I found the cause in layouts. With the attached patch for the verbatim and
> code insets are making some tests happy.
>
Next error in attached example. As soon as we dissolve the 'include
TestSummary.lyx' from branch,
the docum
Am Donnerstag, 26. Mai 2016 um 17:16:30, schrieb Scott Kostyshak
> On Thu, May 26, 2016 at 06:44:39PM +0200, Kornel Benko wrote:
> > Am Mittwoch, 25. Mai 2016 um 16:48:58, schrieb Kornel Benko
> > > Am Montag, 23. Mai 2016 um 18:03:27, schrieb Scott Kostyshak
> > >
> > > > On Mon, May 23, 2016
Am Samstag, den 28.05.2016, 05:30 -0400 schrieb Scott Kostyshak:
> To branch 2.2.x can't we always do
>
> git branch 2.2.x 2.2.0
>
> regardless of whether 2.3-staging was merged into master?
You're right, I didn't think of that possibility.
Jürgen
> Scott
On Sat, May 28, 2016 at 11:21:22AM +0200, Jürgen Spitzmüller wrote:
> Am Freitag, den 27.05.2016, 22:03 -0400 schrieb Scott Kostyshak:
> > Since I've never done this before, can someone confirm that all we
> > have
> > to do is
> >
> > git checkout master
> > git merge 2.3-staging
> >
> > ?
>
>
Am Freitag, den 27.05.2016, 22:03 -0400 schrieb Scott Kostyshak:
> Since I've never done this before, can someone confirm that all we
> have
> to do is
>
> git checkout master
> git merge 2.3-staging
>
> ?
What needs to be done first, in any case, is branching 2.2.x.
Jürgen
