Re: [Development] git submodules

2013-12-31 Thread Mandeep Sandhu
1 more suggestion. Whenever you're working a new feature, it'll most likely go into the 'dev' branch and if it's an improvement/bug fix which not very invasive, it'll likely go into the 'stable' branch. So when you pick up a task from the bug-tracker, you'll know which branch it has to be based o

Re: [Development] git submodules

2013-12-31 Thread Jiergir Ogoerg
I see, thanks. On Wed, Jan 1, 2014 at 3:22 AM, Sze Howe Koh wrote: > On 1 January 2014 09:00, Jiergir Ogoerg wrote: >> >> Thanks a lot, I was about to write I figured it out, but your reply >> gave me further insight. > > You're welcome. > > >> The prick required _all_ previous commits to have C

Re: [Development] git submodules

2013-12-31 Thread Sze Howe Koh
On 1 January 2014 09:00, Jiergir Ogoerg wrote: > > Thanks a lot, I was about to write I figured it out, but your reply > gave me further insight. You're welcome. > The prick required _all_ previous commits to have Change-Id too.. took > me a while to figure this out.. and to learn git rebase..

Re: [Development] git submodules

2013-12-31 Thread Jiergir Ogoerg
Thanks a lot, I was about to write I figured it out, but your reply gave me further insight. The prick required _all_ previous commits to have Change-Id too.. took me a while to figure this out.. and to learn git rebase.. What I can't figure out is - which qt version (4 or 5) do these belong to?

Re: [Development] git submodules

2013-12-31 Thread Sze Howe Koh
On 1 January 2014 04:00, Jiergir Ogoerg wrote: > Thanks, > I managed to commit my changes to local qtbase, but when trying to > push from the folder qtbase to gerrit it complains about > "Change-Id"... Hi, If you have a look at other commit messages (e.g. https://codereview.qt-project.org/#chan

Re: [Development] git submodules

2013-12-30 Thread Mandeep Sandhu
On Tue, Dec 31, 2013 at 9:19 AM, Jiergir Ogoerg wrote: > Hi, > the Qt tutorials that explain how to use git don't mention git submodules. There are quite a few tutorials on the web on git submodules. In a nutshell, a submodule is an independent git repository that can reside/be referenced by anot

[Development] git submodules

2013-12-30 Thread Jiergir Ogoerg
Hi, the Qt tutorials that explain how to use git don't mention git submodules. Is that why after doing changes to some source file "git diff" doesn't show the changes as expected from reading this: http://qt-project.org/wiki/Git_Introduction I'm working with the files from qt5/qtbase/src/plugins/