Jean-Pierre Chrétien jeanpierre.chretien at free.fr writes:
Compiles fine on Debian squeeze, , happy that you could commit patch
correcting bug #8648.
Configuration
[]
C++ Compiler: g++ (4.4.5)
[]
Qt 4 Frontend:
Qt 4 version: 4.6.3
[]
I've
Le 24/05/13 10:28, Jean-Marc Lasgouttes a écrit :
The branch, empty-length, has been updated.
- Log -
commit 85e391e43a6d7188683dacae729475e77597415d
Author: Jean-Marc Lasgouttes lasgout...@lyx.org
Date: Wed May 22 15:50:44 2013
On Fri, May 24, 2013 at 10:46 AM, Jean-Marc Lasgouttes
lasgout...@lyx.orgwrote:
Le 24/05/13 10:28, Jean-Marc Lasgouttes a écrit :
The branch, empty-length, has been updated.
- Log --**--**
-
commit
Le 24/05/13 12:20, Vincent van Ravesteijn a écrit :
I've reset the branch now to the last commit you made. All commits from
master were somehow rebased or cherry-picked on top of the feature branch.
Thanks, I am not sure what I did wrong.
You can merge it into master by:
git checkout
My procedure for doing this kind of thing is similar but avoids the last
merge step:
git checkout mybranch
# Make sure the history here is the way I want it to be, e.g.:
git log
git rebase -i HEAD~5
# Now rebase against master
git rebase master
# We'll push this branch to master using a
On Fri, May 24, 2013 at 3:00 PM, Richard Heck rgh...@lyx.org wrote:
My procedure for doing this kind of thing is similar but avoids the last
merge step
It is the question whether we want to have the merge commit, or we don't
want it.
If a feature consists of 20 small changes, it might be
Le 24/05/13 12:20, Vincent van Ravesteijn a écrit :
I've reset the branch now to the last commit you made. All commits from
master were somehow rebased or cherry-picked on top of the feature branch.
You can merge it into master by:
git checkout master
git merge empty-length -m Please
Did you reset your local empty-length branch to 85e391e43 ? (That's your
last commit before hell broke loose)
Vincent
On Fri, May 24, 2013 at 3:18 PM, Jean-Marc Lasgouttes lasgout...@lyx.orgwrote:
Le 24/05/13 12:20, Vincent van Ravesteijn a écrit :
I've reset the branch now to the last
On 05/24/2013 09:07 AM, Vincent van Ravesteijn wrote:
By the way, this doesn't always work. The kill-gettext branch, for
instance, has master merged in a few times to fix merge conflicts.
Now, rebasing onto the merge-base does do no good.
Yes, in that case, it would seem merging into master
Le 24/05/13 15:40, Vincent van Ravesteijn a écrit :
Did you reset your local empty-length branch to 85e391e43 ? (That's your
last commit before hell broke loose)
OK, I think I pushed it correctly now.
JMarc
Le 23/05/13 23:51, Stephan Witt a écrit :
It jumps to the end of this paragraph here.
I've tried the mac-cursor4.diff patch. I tested it with the Users Guide and the
Beamer Doc.
I'm fine with it.
Let's apply it, then.
JMarc
On Thu, May 23, 2013 at 10:11 PM, Richard Heck rgh...@lyx.org wrote:
I have posted a lyx2lyx conversion routine to the bug report
http://www.lyx.org/trac/ticket/8588#comment:23
Please test and let me know if there are problems. If so, please post the
Richard, I'm afraid I'm having
On 05/24/2013 05:55 PM, Liviu Andronic wrote:
On Thu, May 23, 2013 at 10:11 PM, Richard Heck rgh...@lyx.org wrote:
I have posted a lyx2lyx conversion routine to the bug report
http://www.lyx.org/trac/ticket/8588#comment:23
Please test and let me know if there are problems. If so, please
On Thu, Mar 28, 2013 at 1:57 AM, Scott Kostyshak skost...@lyx.org wrote:
On Fri, Mar 22, 2013 at 3:03 PM, Scott Kostyshak skost...@lyx.org wrote:
On Wed, Jan 9, 2013 at 10:25 PM, Scott Kostyshak skost...@lyx.org wrote:
On Thu, Oct 11, 2012 at 5:06 PM, Jean-Marc Lasgouttes
lasgout...@lyx.org
During GSoC applications and even after, there was demand for small
bugs to work on that was not met. I would like to start marking
tickets as 'easyfix' tags to indicate that such tickets would be a
good learning process for someone that is not very familiar with LyX's
code.
I'm interested in
Scott Kostyshak wrote:
I propose the following description (and perhaps a new keyword name?):
easyfix: fixing this bug is achievable for a newcommer to LyX
development and would be a good learning experience.
Feel free to change it.
Two questions I have are:
How confident should I be
Jean-Pierre Chrétien free.fr> writes:
>
> Compiles fine on Debian squeeze, , happy that you could commit patch
> correcting bug #8648.
>
> Configuration
[]
> C++ Compiler: g++ (4.4.5)
[]
> Qt 4 Frontend:
> Qt 4 version: 4.6.3
[]
I've upgraded from
Le 24/05/13 10:28, Jean-Marc Lasgouttes a écrit :
The branch, empty-length, has been updated.
- Log -
commit 85e391e43a6d7188683dacae729475e77597415d
Author: Jean-Marc Lasgouttes
Date: Wed May 22 15:50:44
On Fri, May 24, 2013 at 10:46 AM, Jean-Marc Lasgouttes
wrote:
> Le 24/05/13 10:28, Jean-Marc Lasgouttes a écrit :
>
> The branch, empty-length, has been updated.
>>
>> - Log --**--**
>> -
>>
>> commit
Le 24/05/13 12:20, Vincent van Ravesteijn a écrit :
I've reset the branch now to the last commit you made. All commits from
master were somehow rebased or cherry-picked on top of the feature branch.
Thanks, I am not sure what I did wrong.
You can merge it into master by:
git checkout
My procedure for doing this kind of thing is similar but avoids the last
merge step:
git checkout mybranch
# Make sure the history here is the way I want it to be, e.g.:
git log
git rebase -i HEAD~5
# Now rebase against master
git rebase master
# We'll push this branch to master using a
On Fri, May 24, 2013 at 3:00 PM, Richard Heck wrote:
>
> My procedure for doing this kind of thing is similar but avoids the last
> merge step
>
It is the question whether we want to have the merge commit, or we don't
want it.
If a feature consists of 20 small changes, it might
Le 24/05/13 12:20, Vincent van Ravesteijn a écrit :
I've reset the branch now to the last commit you made. All commits from
master were somehow rebased or cherry-picked on top of the feature branch.
You can merge it into master by:
git checkout master
git merge empty-length -m "Please
Did you reset your local empty-length branch to 85e391e43 ? (That's your
last commit before hell broke loose)
Vincent
On Fri, May 24, 2013 at 3:18 PM, Jean-Marc Lasgouttes wrote:
> Le 24/05/13 12:20, Vincent van Ravesteijn a écrit :
>
> I've reset the branch now to the
On 05/24/2013 09:07 AM, Vincent van Ravesteijn wrote:
By the way, this doesn't always work. The kill-gettext branch, for
instance, has master merged in a few times to fix merge conflicts.
Now, rebasing onto the merge-base does do no good.
Yes, in that case, it would seem merging into master
Le 24/05/13 15:40, Vincent van Ravesteijn a écrit :
Did you reset your local empty-length branch to 85e391e43 ? (That's your
last commit before hell broke loose)
OK, I think I pushed it correctly now.
JMarc
Le 23/05/13 23:51, Stephan Witt a écrit :
It jumps to the end of this paragraph here.
I've tried the mac-cursor4.diff patch. I tested it with the Users Guide and the
Beamer Doc.
I'm fine with it.
Let's apply it, then.
JMarc
On Thu, May 23, 2013 at 10:11 PM, Richard Heck wrote:
>
> I have posted a lyx2lyx conversion routine to the bug report
> http://www.lyx.org/trac/ticket/8588#comment:23
> Please test and let me know if there are problems. If so, please post the
>
Richard, I'm afraid I'm having
On 05/24/2013 05:55 PM, Liviu Andronic wrote:
On Thu, May 23, 2013 at 10:11 PM, Richard Heck wrote:
I have posted a lyx2lyx conversion routine to the bug report
http://www.lyx.org/trac/ticket/8588#comment:23
Please test and let me know if there are problems. If so, please
On Thu, Mar 28, 2013 at 1:57 AM, Scott Kostyshak wrote:
> On Fri, Mar 22, 2013 at 3:03 PM, Scott Kostyshak wrote:
>> On Wed, Jan 9, 2013 at 10:25 PM, Scott Kostyshak wrote:
>>> On Thu, Oct 11, 2012 at 5:06 PM, Jean-Marc Lasgouttes
>>>
During GSoC applications and even after, there was demand for small
bugs to work on that was not met. I would like to start marking
tickets as 'easyfix' tags to indicate that such tickets would be a
good learning process for someone that is not very familiar with LyX's
code.
I'm interested in
Scott Kostyshak wrote:
> I propose the following description (and perhaps a new keyword name?):
>
> easyfix: fixing this bug is achievable for a newcommer to LyX
> development and would be a good learning experience.
Feel free to change it.
> Two questions I have are:
>
> How confident should
32 matches
Mail list logo