On Saturday 23 July 2011 01:42:16 David Jarvie wrote:
On Saturday 23 July 2011 00:00:16 Nicolas Alvarez wrote:
There is no active policy saying you're supposed to merge. Almost everybody
in KDE is still doing cherry-picks. KDevelop is the only KDE project I know
that consistently uses
On Saturday 23 July 2011 19:28:53 Ben Cooksley wrote:
During the stable branch freeze before a minor version release (such as
currently
before
the 4.7 release), it isn't possible to commit bug fixes to stable first and
then merge to
master.
Only master can be committed to, so
Nicolas Alvarez wrote:
- Figure out how to solve the scripty problem. scripty does its own
conflicting commits to .desktop files in both branches, and that won't
change[1]. We probably need a custom merge tool for .desktop-like files
that ignores translations.
I *think* I managed to write
Am 7/21/2011 23:22, schrieb Aurélien Gâteau:
What I have been doing recently to avoid cherry-picking is to create my
fixes in a separate work branch, then merge the branch in both 4.7 and
master branches. This way the commits do not have different commit ids.
But this works only if you fork
Alex Fiestas wrote:
Last few days I have been patching some pieces of our workspace here and
there, the first set of patches I did them directly into master which if
I remember correctly was against the policy.
So, the second round of fixes I tried to do it the right way, which is:
1-Create
On Saturday 23 July 2011 00:00:16 Nicolas Alvarez wrote:
There is no active policy saying you're supposed to merge. Almost everybody
in KDE is still doing cherry-picks. KDevelop is the only KDE project I know
that consistently uses forward-merges from the stable branch to master.
---
It
Le 20/07/2011 11:52, Alex Fiestas a écrit :
Hi there
Last few days I have been patching some pieces of our workspace here and
there, the first set of patches I did them directly into master which if
I remember correctly was against the policy.
So, the second round of fixes I tried to do
On Wed, Jul 20, 2011 at 11:52:31AM +0200, Alex Fiestas wrote:
5-Merge 4.7 into master
have you slept the last months? ;)
kde continues to use a cherry-pick policy. *don't* forward-merge.
On Wednesday 20 July 2011 11:52:31 Alex Fiestas wrote:
Hi there
Last few days I have been patching some pieces of our workspace here and
there, the first set of patches I did them directly into master which if
I remember correctly was against the policy.
So, the second round of fixes I
