<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<div class="moz-cite-prefix">Hi,<br>
On 17.02.2013 14:43, Friedrich W. H. Kossebau wrote:<br>
</div>
<blockquote cite="mid:1402104.jJ132LfoHq@klux.site" type="cite">
<pre wrap="">Am Sonntag, 17. Februar 2013, 13:56:58 schrieb Maurice de la Ferté:
</pre>
<blockquote type="cite">
<pre wrap="">On 17.02.2013 02:02, Friedrich W. H. Kossebau wrote:
</pre>
<blockquote type="cite">
<pre wrap="">Am Samstag, 16. Februar 2013, 04:38:09 schrieb Maurice de la Ferté:
</pre>
<blockquote type="cite">
<pre wrap="">On 16.02.2013 03:21, Friedrich W. H. Kossebau wrote:
</pre>
<blockquote type="cite">
<pre wrap="">2. How is review done for spec/yaml changes?
</pre>
</blockquote>
<pre wrap="">Best practice is
- 'osc branch Project:KDE:Devel calligra'
- checkout local copy of branched package
- making changes
- building local
- pushing changes
- building remote
- reviewing rpmlint messages in logs
- adding branching repos to test machine
- installing branching packages on test machine
- 'osc submitrequest <branched project> calligra Project:KDE:Devel'
- asking for review on #active
</pre>
</blockquote>
<pre wrap="">First trivial request is up, seems it works all for me :)
</pre>
</blockquote>
<pre wrap="">Request is applied :)
</pre>
</blockquote>
<pre wrap="">\o/
Okay, now that this is established I can get to serious changes :)
Nothing in the pipe yet, but already thinking about how to best fix the
incomplete registering for all supported mimetypes within the Calligra build
system. Too late for 2.6.1, but than packagers can always still patch the
released stuff ;)
Next questions:
Can I reuse that branch I created somehow?
How do I ideally merge the changes from the official calligra package?
Any request is just a diff between the branch to the official package, or?</pre>
</blockquote>
Yes you can reuse this branched project so long you are not deleting<br>
it. By sending submit requests via Web-Frontend you will see a
checkbox<br>
about something like 'deleting after merge', which is enabled by
default.<br>
This behaviour is disabled by using 'osc submitrequest' via command<br>
line. A easy way to keep in sync with original package is following
setup:<br>
<br>
1. Branch a random package from the original project.<br>
By this you will get the repository setup and build dependencies<br>
from the original project.<br>
<br>
e.g. osc branch Project:KDE:Devel/cmake<br>
<br>
2. Open project home:<user>:Project:KDE:Devel via Web-Frontend<br>
and enable repository publishing.<br>
<br>
Repositories --> Publish Flag --> All --> Explicity
enable<br>
<br>
By this you are able to install the packages directly on your
test machine<br>
<br>
3. Open project home:<user>:Project:KDE:Devel via Web-Frontend<br>
and branch the package you like to modify/maintain.<br>
<br>
Packages --> Branch package from other project --><br>
Name of original project: Project:KDE:Devel<br>
Name of package in original project: calligra<br>
Name of branched package in target project:<br>
<strong></strong><strong></strong><strong></strong><strong></strong>[
] Stay on current revision, don't merge future upstream changes
automatically<br>
<br>
4. Open project home:<user>:Project:KDE:Devel via Web-Frontend<br>
and delete random package again.<br>
<br>
Packages --> cmake --> Delete package<br>
<br>
By this setup you have all changes from original package plus the
changes you are<br>
working on. Please note, by this merge conflicts can happen you have
to solve on<br>
your own.<br>
<br>
Cheers<br>
<br>
Maurice<br>
</body>
</html>