Re: 2.0.4svn...?

Le 02/04/12 00:02, Richard Heck a écrit : Anyone have a view about what we should call what used to be called 2.0.4svn? 2.0.4dev? JMarc

Re: 2.0.4svn...?

On Mon, Apr 2, 2012 at 12:02 AM, Richard Heck rgh...@comcast.net wrote: Anyone have a view about what we should call what used to be called 2.0.4svn? Why do you need one? With git, tags are real tags and not branches as with svn. So I'd recommend to keep developping in 2.0.x branch and tag it

Re: 2.0.4svn...?

Le 02/04/12 09:41, Abdelrazak Younes a écrit : On Mon, Apr 2, 2012 at 12:02 AM, Richard Heckrgh...@comcast.net wrote: Anyone have a view about what we should call what used to be called 2.0.4svn? Why do you need one? To show in the about box. Just so that people can give a name to the

Re: Wiki page editing

Jean-Pierre Chrétien wrote: Hello, I'm willing to edit the web pages after 2.0.3 is out, but now when I try to login nothing happens. Please try now and report if something does not work. Pavel

Re: 2.0.4svn...?

On 04/02/2012 05:41 AM, Jean-Marc Lasgouttes wrote: Le 02/04/12 09:41, Abdelrazak Younes a écrit : On Mon, Apr 2, 2012 at 12:02 AM, Richard Heckrgh...@comcast.net wrote: Anyone have a view about what we should call what used to be called 2.0.4svn? Why do you need one? To show in the

Re: [lyx/refs/heads/master] Merge branch 'master' of lyx:lyx

Vincent van Ravesteijn wrote: You had made local commits onto your master branch. If you then do 'git pull'. It will fetch the commits from the master branch at the server and merge them with your local commits. Thanks for all you answers; started to push things into wiki, so we don't need

Re: [lyx/refs/heads/master] Merge branch 'master' of lyx:lyx

Op 2-4-2012 16:21, Pavel Sanda schreef: Vincent van Ravesteijn wrote: You had made local commits onto your master branch. If you then do 'git pull'. It will fetch the commits from the master branch at the server and merge them with your local commits. Thanks for all you answers; started to

Re: [lyx/refs/heads/master] Merge branch 'master' of lyx:lyx

Vincent van Ravesteijn wrote: I know how to do it otherwise but is there some simple merge command which put the whole branch as a single commit into master without noticing others about the branch-history-mess in my local tree? (on branch master) $ git merge myfeature --squash $ git

Re: Contribution to systematically advance through environments

John Carbone wrote: I wished for a way to just have Requirement in the Environment choice box and be able to cycle through the levels much like one can do with the sections, with the tab key. Since this feature didn't exist, I decided to implement it in a manner generic that I hope will be

Re: Examples of integration between Lyx, Sage computations, and PDFLateX

The attachments on this thread have been posted to the wiki (thanks Christian): http://wiki.lyx.org/Layouts/Modules/#toc7 http://wiki.lyx.org/uploads/Modules/Sage Note that if you customize the sage.module file, you can load the changes immediately by entering layout-reload in the minibuffer.

Re: 2.0.4svn...?

Le 02/04/12 00:02, Richard Heck a écrit : Anyone have a view about what we should call what used to be called 2.0.4svn? 2.0.4dev? JMarc

Re: 2.0.4svn...?

On Mon, Apr 2, 2012 at 12:02 AM, Richard Heck wrote: > > Anyone have a view about what we should call what used to be called > 2.0.4svn? Why do you need one? With git, tags are real tags and not branches as with svn. So I'd recommend to keep developping in 2.0.x branch and

Re: 2.0.4svn...?

Le 02/04/12 09:41, Abdelrazak Younes a écrit : On Mon, Apr 2, 2012 at 12:02 AM, Richard Heck wrote: Anyone have a view about what we should call what used to be called 2.0.4svn? Why do you need one? To show in the about box. Just so that people can give a name to the

Re: Wiki page editing

Jean-Pierre Chrétien wrote: > Hello, > > I'm willing to edit the web pages after 2.0.3 is out, but now when I try to > login nothing happens. Please try now and report if something does not work. Pavel

Re: 2.0.4svn...?

On 04/02/2012 05:41 AM, Jean-Marc Lasgouttes wrote: Le 02/04/12 09:41, Abdelrazak Younes a écrit : On Mon, Apr 2, 2012 at 12:02 AM, Richard Heck wrote: Anyone have a view about what we should call what used to be called 2.0.4svn? Why do you need one? To show in the

Re: [lyx/refs/heads/master] Merge branch 'master' of lyx:lyx

Vincent van Ravesteijn wrote: > You had made local commits onto your master branch. If you then do 'git > pull'. It will fetch the commits from the master branch at the server and > merge them with your local commits. Thanks for all you answers; started to push things into wiki, so we don't

Re: [lyx/refs/heads/master] Merge branch 'master' of lyx:lyx

Op 2-4-2012 16:21, Pavel Sanda schreef: Vincent van Ravesteijn wrote: You had made local commits onto your master branch. If you then do 'git pull'. It will fetch the commits from the master branch at the server and merge them with your local commits. Thanks for all you answers; started to

Re: [lyx/refs/heads/master] Merge branch 'master' of lyx:lyx

Vincent van Ravesteijn wrote: >> I know how to do it otherwise but is there some simple merge command which >> put the whole branch as a single commit into master without noticing >> others >> about the branch-history-mess in my local tree? > > (on branch master) > $ git merge myfeature --squash

Re: Contribution to systematically advance through environments

John Carbone wrote: > I wished for a way to just have "Requirement" in the Environment choice > box and be able to cycle through the levels much like one can do with > the sections, with the tab key. Since this feature didn't exist, I > decided to implement it in a manner generic that I hope will

Re: Examples of integration between Lyx, Sage computations, and PDFLateX

The attachments on this thread have been posted to the wiki (thanks Christian): http://wiki.lyx.org/Layouts/Modules/#toc7 http://wiki.lyx.org/uploads/Modules/Sage Note that if you customize the sage.module file, you can load the changes immediately by entering "layout-reload" in the minibuffer.