Merge-Guidelines: Difference between revisions

From Qt Wiki
Jump to navigation Jump to search
No edit summary
 
No edit summary
Line 1: Line 1:
=Merge process in Qt=
[[Category:Developing_Qt::Guidelines]]


During the development cycle merges are done from the release to stable and stable to dev branches.<br /> See for example [[Branch-Guidelines|http://wiki.qt.io/Branch-Guidelines]] .
[toc align_right=&quot;yes&amp;quot; depth=&quot;1&amp;quot;]


The merge in the other direction happens in coordination with the release team.
= Merge process in Qt =


=Merge instructions=
During the development cycle merges are done from the release to stable and stable to dev branches.<br />See for example http://wiki.qt.io/Branch-Guidelines .


There are several ways to go about the merges, for individual merges of one repository use the normal git merge command.<br /> Note that you need special permissions to push merges and gerrit will refuse your push otherwise.
The merge in the other direction happens in coordination with the release team.


Since it’s not feasible to do so many commands manually for each repository, there is a script in qtrepotools/bin.<br /> Make sure to have python and qtrepotools/bin in your path.<br /> Shows the status. Pass it -d to do the merges. -f is the source branch and -t is the branch that the merge ends up in.
= Merge instructions =


===Categories:===
There are several ways to go about the merges, for individual merges of one repository use the normal git merge command.<br /><code><br />git fetch<br />git checkout -B dev origin/dev<br />git merge origin/stable<br />git push gerrit HEAD:refs/for/dev<br /></code><br />Note that you need special permissions to push merges and gerrit will refuse your push otherwise.


* [[:Category:Developing Qt|Developing_Qt]]
Since it's not feasible to do so many commands manually for each repository, there is a script in qtrepotools/bin.<br />Make sure to have python and qtrepotools/bin in your path.<br /><code><br />cd qt5 # this command needs a full checkout of qt5.git and all submodules<br />git qt-merge-mainlines -s -f stable -t dev<br /></code><br />Shows the status. Pass it -d to do the merges. -f is the source branch and -t is the branch that the merge ends up in.
** [[:Category:Developing Qt::Guidelines|Guidelines]]

Revision as of 11:10, 24 February 2015


[toc align_right="yes&quot; depth="1&quot;]

Merge process in Qt

During the development cycle merges are done from the release to stable and stable to dev branches.
See for example http://wiki.qt.io/Branch-Guidelines .

The merge in the other direction happens in coordination with the release team.

Merge instructions

There are several ways to go about the merges, for individual merges of one repository use the normal git merge command.

<br />git fetch<br />git checkout -B dev origin/dev<br />git merge origin/stable<br />git push gerrit HEAD:refs/for/dev<br />


Note that you need special permissions to push merges and gerrit will refuse your push otherwise. Since it's not feasible to do so many commands manually for each repository, there is a script in qtrepotools/bin.
Make sure to have python and qtrepotools/bin in your path.

<br />cd qt5 # this command needs a full checkout of qt5.git and all submodules<br />git qt-merge-mainlines -s -f stable -t dev<br />


Shows the status. Pass it -d to do the merges. -f is the source branch and -t is the branch that the merge ends up in.

Retrieved from "https://wiki.qt.io/index.php?title=Merge-Guidelines&oldid=5178"