Re: [LMMS-devel] which branch of the git repo to pull.

2014-12-30 Thread Tres Finocchiaro
Thanks for testing on Yosemite. I've made some changes to the scripts and instructions to get Lion to compile however the DMG script does not change the icons or background on Lion and needs to be fixed. The bug tracker is the best place for issues or questions you have while investigating the bu

Re: [LMMS-devel] which branch of the git repo to pull.

2014-12-30 Thread Jonathan Aquilina
@tres I know I'm rehashing an old thread here but I'm glad to report that 1.1 compiled and installed successfully on 10.10. Now to start working on debugging mac specific issues and join this great team of developers :) On Mon, Dec 8, 2014 at 3:41 PM, Tres Finocchiaro wrote: > > On Mon, Dec 8,

Re: [LMMS-devel] which branch of the git repo to pull.

2014-12-08 Thread Tres Finocchiaro
On Mon, Dec 8, 2014 at 9:18 AM, Jonathan Aquilina wrote: > Yosemite > Terrific! Please open a bug report if you encounter any issues. We've never built for that so we're likely to encounter more Clang issues! :) -Tres ---

Re: [LMMS-devel] which branch of the git repo to pull.

2014-12-08 Thread Jonathan Aquilina
Yosemite On Mon, Dec 8, 2014 at 3:14 PM, Tres Finocchiaro wrote: > > I have all dependencies setup on my new mac, but I am wondering which > branch to fork. Should i fork master or in terms of mac related bugs always > the latest stable branch? > > Jonathan, are you building on Mavericks or Yose

Re: [LMMS-devel] which branch of the git repo to pull.

2014-12-08 Thread Tres Finocchiaro
> I have all dependencies setup on my new mac, but I am wondering which branch to fork. Should i fork master or in terms of mac related bugs always the latest stable branch? Jonathan, are you building on Mavericks or Yosemite? P.S. we just patched stable-1.1 for Apple

Re: [LMMS-devel] which branch of the git repo to pull.

2014-12-07 Thread I'm Umcaruje
> > I struggle to remember some of the git commands, so if anyone has > recommendations for a better wiki article, please advise. :) You should add a new remote by doing 'git remote add upstream https://github.com/LMMS/lmms.git' After that you can just do 'git pull --rebase upstream master' whene

Re: [LMMS-devel] which branch of the git repo to pull.

2014-12-07 Thread Tres Finocchiaro
The article title may be a bit misleading for this specific task... https://github.com/LMMS/lmms/wiki/%5BGit%5D-Fast-forward-personal-branch-to-upstream I struggle to remember some of the git commands, so if anyone has recommendations for a better wiki article, please advise. :) - tres.finocchi.

Re: [LMMS-devel] which branch of the git repo to pull.

2014-12-07 Thread Jonathan Aquilina
Thanks just found it. On Sun, Dec 7, 2014 at 10:16 AM, Lukas W. wrote: > It is. > > 2014-12-07 9:25 GMT+01:00 Jonathan Aquilina : > >> Thanks Vesa, Is that somewhere on the wiki? If not I will add it. >> >> On Sun, Dec 7, 2014 at 9:24 AM, Vesa wrote: >> >>> Like, if you're on master branch / a

Re: [LMMS-devel] which branch of the git repo to pull.

2014-12-07 Thread Lukas W.
It is. 2014-12-07 9:25 GMT+01:00 Jonathan Aquilina : > Thanks Vesa, Is that somewhere on the wiki? If not I will add it. > > On Sun, Dec 7, 2014 at 9:24 AM, Vesa wrote: > >> Like, if you're on master branch / a branch forked from master, you'd >> sync it up with the main LMMS repo with: >> >> gi

Re: [LMMS-devel] which branch of the git repo to pull.

2014-12-07 Thread Jonathan Aquilina
Thanks Vesa, Is that somewhere on the wiki? If not I will add it. On Sun, Dec 7, 2014 at 9:24 AM, Vesa wrote: > Like, if you're on master branch / a branch forked from master, you'd > sync it up with the main LMMS repo with: > > git pull --rebase git://github.com/LMMS/lmms.git master > > > > ---

Re: [LMMS-devel] which branch of the git repo to pull.

2014-12-07 Thread Vesa
Like, if you're on master branch / a branch forked from master, you'd sync it up with the main LMMS repo with: git pull --rebase git://github.com/LMMS/lmms.git master -- Download BIRT iHub F-Type - The Free Enterprise-Gr

Re: [LMMS-devel] which branch of the git repo to pull.

2014-12-07 Thread Vesa
On 12/07/2014 08:07 AM, Jonathan Aquilina wrote: > Call me crazy, but is there a page on the wiki which explains how to > setup your forked repo so you can pull any changes of that particular > repo on it? You can do that with git pull --rebase

Re: [LMMS-devel] which branch of the git repo to pull.

2014-12-06 Thread Jonathan Aquilina
Call me crazy, but is there a page on the wiki which explains how to setup your forked repo so you can pull any changes of that particular repo on it? On Sat, Dec 6, 2014 at 5:09 PM, Tres Finocchiaro wrote: > Start with stable. Some fixes (such as file association) probably won't > make 1.1 bec

Re: [LMMS-devel] which branch of the git repo to pull.

2014-12-06 Thread Tres Finocchiaro
Start with stable. Some fixes (such as file association) probably won't make 1.1 because they require touch too much code to implement, but we'll cross that bridge when we get there. Other bugs (Zyn crash, SF2 crash) will likely make it to stable-1.1. -

Re: [LMMS-devel] which branch of the git repo to pull.

2014-12-06 Thread Vesa
As for which branch to target, it's simple, as always: bugfixes for 1.1, everything else for master -- Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Rep

Re: [LMMS-devel] which branch of the git repo to pull.

2014-12-06 Thread Vesa
On 12/06/2014 11:07 AM, Jonathan Aquilina wrote: > Hi guys, > > I have all dependencies setup on my new mac, but I am wondering which > branch to fork. Should i fork master or in terms of mac related bugs > always the latest stable branch? You fork the entire repo, you can then switch branches on

[LMMS-devel] which branch of the git repo to pull.

2014-12-06 Thread Jonathan Aquilina
Hi guys, I have all dependencies setup on my new mac, but I am wondering which branch to fork. Should i fork master or in terms of mac related bugs always the latest stable branch? -- Jonathan Aquilina -- Download BIRT i