should commits in "/branches/KDE/4.6/" be picked?

[Danny Allen]

Hi all,
In the past cases where an identical commit is done in both trunk and branch, I have always preferred the trunk commit and ignored/deleted the branch commit, just because I see the Digest as being a report on cutting-edge developments. I can see how choosing the branch commit instead could be good for readers too though... as long as we have a consistent policy I am happy.

-----------------------------------

In other news, I am currently bulk importing Git commits that have collected over the last 3 weeks - it seems stable enough (and Digest production has caught up to this stage!) to do this now.

Enzyme seems unresponsive to me at the moment because of this and I don't want to risk corruption of data, so I'm going to disable logins until this has completed. This shouldn't take more than a couple of hours. From now on, Git commits should be a regular presence, which is nice!

Cheers,
Danny


----- Original Message -----
From: "mutlu_inek" <mutlu_inek at yahoo.de>
To: "digest" <digest at kde.org>, "Marco Krohn" <marco.krohn at googlemail.com>
Sent: Saturday, 15 January, 2011 1:10:14 PM
Subject: Re: should commits in "/branches/KDE/4.6/" be picked?

KDE SC 4.6 bas been branched and trunk is now 4.7. Many developers already develop in trunk, to be able to check in new features. They then backport fixed done in trunk to the 4.6 branch. Thus, the commit should appear twice. I think it should not matter, which of these we chose, as long as it is actually backported. I would prefer the actual backport, though.

So, basically, I agree with Marco.

Cheers,

mutlu


--- Marco Krohn <marco.krohn at googlemail.com> schrieb am Fr, 14.1.2011:

> Von: Marco Krohn <marco.krohn at googlemail.com>
> Betreff: Re: should commits in "/branches/KDE/4.6/" be picked?
> An: "digest" <digest at kde.org>
> Datum: Freitag, 14. Januar, 2011 23:22 Uhr
> Hi,
> 
> The second Release Candidate of 4.6 was announced recently;
> thus only
> critical fixes are allowed. I would assume that all fixes
> to 4.6 will
> be fixed in trunk, as well. In my opinion it is just fine
> to insert
> the branch commit in case you do not find the trunk
> equivalent.
> 
> Good to see that so much work on the Commit Digest
> happens.... great
> job everyone!
> 
> best regards,
>   Marco
> 
> On Fri, Jan 14, 2011 at 9:55 PM, Vladislav Blanton <vblanton at gmail.com>
> wrote:
> > Hello all,
> >
> > I am a little confused about commits in
> "/branches/KDE/4.6/"
> >
> > 4.6 hasn't been released yet, and so they don't always
> seem to be
> > backports, but sometimes they are.
> >
> > Is it o.k. to add the most interesting last-minute
> fixes to this
> > branch, or should we always look for the /trunk/
> equivalent?
> >
> > V
> > _______________________________________________
> > Digest mailing list
> > Digest at kde.org
> > https://mail.kde.org/mailman/listinfo/digest
> >
> _______________________________________________
> Digest mailing list
> Digest at kde.org
> https://mail.kde.org/mailman/listinfo/digest
> 


_______________________________________________
Digest mailing list
Digest at kde.org
https://mail.kde.org/mailman/listinfo/digest