On Wed, Dec 9, 2009 at 6:15 AM, Mark Kretschmann <span dir="ltr"><<a href="mailto:kretschmann@kde.org">kretschmann@kde.org</a>></span> wrote:<br><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
<div class="im">On Wed, Dec 9, 2009 at 11:53 AM, Nikolaj Hald Nielsen<br>
<<a href="mailto:nhnfreespirit@gmail.com">nhnfreespirit@gmail.com</a>> wrote:<br>
</div><div class="im">>> One of our problems with 2.2.2 currently is that we're in string (and<br>
>> feature) freeze, so many patches, ideas, and Merge Requests are on<br>
>> hold. What if we created a 2.2.3 branch, and started to work on two<br>
>> versions in parallel, before 2.2.2 is actually tagged?<br>
><br>
> I don't think this is a good idea for a couple of reasons.<br>
><br>
> What would happen is the same that always happens when we have a<br>
> stable branch and a "fun" feature branch. We are all suckers for cool<br>
> new features, so the feature branch is what everyone will end up<br>
> running, meaning that there is less focus on fixing bugs in the stable<br>
> branch and less overall testing of it.<br>
<br>
</div>Well, I see your point, and I agree that there is a risk of losing<br>
focus on what is important (getting the current release done).<br>
<br>
But let me give you a practical example:<br>
<br>
In the Collection settings, we have this button "Import Collection". I<br>
think we had discussed this before, and the problem with it is that<br>
it's a bit of a misnomer (doesn't import the collection, but rather<br>
the statistics). So I quickly wanted to add a tooltip for it, or<br>
rename the button. Not possible because of string freeze.<br>
<br>
Now, I have two options: 1) Put it on my already loooooong TODO list.<br>
2) Put it in some feature branch that I often forget about.<br>
<br>
<br>
Having an official branch for 2.2.3 could solve these issues elegantly, I think.</blockquote><div><br></div><div>Or you could have your own "string changes" branch that you push any string change commits to, and then merge it in as soon as 2.2.3 opens up again. As long as you tell people if you merge a request there so it's not merged twice, that should be fine.</div>
<div><br></div><div>leo </div></div><br>-- <br>______________________________________________________<br><a href="mailto:lfranchi@kde.org">lfranchi@kde.org</a> Tufts University 2010<br><a href="mailto:leonardo.franchi@tufts.edu">leonardo.franchi@tufts.edu</a> The KDE Project<br>