Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

27/05/2013 22:18, Vincent van Ravesteijn: I tested the branch a bit more. - When you just implemented this, my LyX was translated immediately, but now it can't find the translations anymore. This is a pity. I don't really understand the following: + if (in_build_dir_) +return

Re: Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

Am Dienstag, 28. Mai 2013 um 13:42:33, schrieb Jean-Marc Lasgouttes lasgout...@lyx.org 27/05/2013 22:18, Vincent van Ravesteijn: I tested the branch a bit more. - When you just implemented this, my LyX was translated immediately, but now it can't find the translations anymore. This is a

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

27/05/2013 22:18, Vincent van Ravesteijn: I tested the branch a bit more. - When you just implemented this, my LyX was translated immediately, but now it can't find the translations anymore. This is a pity. I don't really understand the following: + if (in_build_dir_) +return

Re: Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

Am Dienstag, 28. Mai 2013 um 13:42:33, schrieb Jean-Marc Lasgouttes > 27/05/2013 22:18, Vincent van Ravesteijn: > > I tested the branch a bit more. > > > > - When you just implemented this, my LyX was translated immediately, but > > now it can't find the translations anymore.

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

24/05/2013 15:07, Vincent van Ravesteijn: 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. Vincent, I want to merge this kill-gettext branch now. Is there

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

Op 27-5-2013 18:05, Jean-Marc Lasgouttes schreef: 24/05/2013 15:07, Vincent van Ravesteijn: 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. Vincent, I want

Re: Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

Am Montag, 27. Mai 2013 um 19:59:44, schrieb Vincent van Ravesteijn v...@lyx.org Op 27-5-2013 18:05, Jean-Marc Lasgouttes schreef: 24/05/2013 15:07, Vincent van Ravesteijn: By the way, this doesn't always work. The kill-gettext branch, for instance, has master merged in a few times to fix

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

Op 27-5-2013 18:05, Jean-Marc Lasgouttes schreef: 24/05/2013 15:07, Vincent van Ravesteijn: 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. Vincent, I want

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

24/05/2013 15:07, Vincent van Ravesteijn: 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. Vincent, I want to merge this kill-gettext branch now. Is there

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

Op 27-5-2013 18:05, Jean-Marc Lasgouttes schreef: 24/05/2013 15:07, Vincent van Ravesteijn: 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. Vincent, I want

Re: Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

Am Montag, 27. Mai 2013 um 19:59:44, schrieb Vincent van Ravesteijn > Op 27-5-2013 18:05, Jean-Marc Lasgouttes schreef: > > 24/05/2013 15:07, Vincent van Ravesteijn: > >> By the way, this doesn't always work. The kill-gettext branch, for > >> instance, has master merged in a few

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

Op 27-5-2013 18:05, Jean-Marc Lasgouttes schreef: 24/05/2013 15:07, Vincent van Ravesteijn: 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. Vincent, I want

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

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

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

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

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

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

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

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

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

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

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

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

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

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

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

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

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

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

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

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

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

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

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

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

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

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

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

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

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

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

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

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

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

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

Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

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