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 on (dev or stable). Before starting work, update the relevant dev or stable branch first by doing 'git pull' on it and then create your topic branch from it by doing 'git checkout -b QTBUG-2014'. With this way of naming the branch you can easily see what all tasks you're working on and in which branch. HTH, -mandeep On Wed, Jan 1, 2014 at 7:09 AM, Jiergir Ogoerg <[email protected]> wrote: > I see, thanks. > > On Wed, Jan 1, 2014 at 3:22 AM, Sze Howe Koh <[email protected]> wrote: >> On 1 January 2014 09:00, Jiergir Ogoerg <[email protected]> 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.. >> >> Necessity is the mother of speedy learning ;) >> >> >>> What I can't figure out is - which qt version (4 or 5) do these belong to? >>> >>> For example I pushed (then abandoned) this: >>> https://codereview.qt-project.org/#change,74520 >>> >>> Was it in queue for Qt4 or Qt5, the webpage doesn't mention any of these.. >> >> That's Qt 5. Qt 5 has the modular structure with different submodules >> (the "Project" field values are "qt/qtbase", "qt/qtdeclarative", >> etc.), and uses the new "dev"/"stable"/"release" branch model: >> http://qt-project.org/wiki/Branch-Guidelines. You may come across some >> unreleased Qt 5 submodules that use the old branch model, with a >> "master" branch. >> >> Qt 4 is monolithic (the "Project" field is only "qt/qt"), and the only >> active branch is "4.8". Example: >> https://codereview.qt-project.org/#change,73452 >> >> >> Qt 5 example: >> https://codereview.qt-project.org/#q,status:open+project:qt/qtbase,n,z >> Qt 4 example: >> https://codereview.qt-project.org/#q,status:open+project:qt/qt,n,z >> >> >> Sze-Howe > _______________________________________________ > Development mailing list > [email protected] > http://lists.qt-project.org/mailman/listinfo/development _______________________________________________ Development mailing list [email protected] http://lists.qt-project.org/mailman/listinfo/development
