Am Donnerstag, 15. März 2012 um 01:25:16, schrieb Lars Gullik Bjønnes <lar...@gullik.org> > On Thu, Mar 15, 2012 at 01:20, Julien Rioux <jri...@lyx.org> wrote: > > Uwe, may I suggest to have two clones in two different folders. In one of > > them you checkout 2.0.x, in the other you checkout master. I have found that > > switching between 2.0.x and master within the same clone folder doesn't work > > well at the moment anyway, as it leads to conflicting po files in the source > > tree. > > This is a problem with how things are built in LyX.
In autoconf, cmake build has no problems here. (Created po files are also in
the build dir)
> Easy enough to reset (or stash) your working tree before you checkout the
> other
> branch though.
Is this the way to switch between master and 2.0.x source tree?
master -> 2.0.x
1.) git stash master
2.) git checkout 2.0.x
3.) git pop 2.0.x
2.0.x -> master
1.) git stash 2.0.x
2.) git checkout master
3.) git pop master
> > Hope this helps, there of course might be other ways.
>
> Still. If you have to copy files between working trees, please
> consider that you might
> be doing something suboptimal/wrong.
>
> --
> Lgb
Kornel
signature.asc
Description: This is a digitally signed message part.
