[drupal-devel] How are patches to branches handled?

[K B]

What about modules, and fixes to branches?

Some background: what prompted me to ask this question is Scott
Courtney's message earlier today:

===
Good morning!

A couple of days ago, I committed a one-line bug fix to the "weblink" module
in CVS, with the DRUPAL-4-5 branch tag. I'm pretty sure it was committed
successfully, because I see it here:

http://cvs.drupal.org/viewcvs/drupal/contributions/modules/weblink/?only_with_tag=DRUPAL-4-5

But it somehow didn't propagate to the main download version for Drupal 4.5,
and doesn't show up here:

http://cvs.drupal.org/viewcvs/drupal/contributions/modules/weblink/

What did I do wrong?
====

And some commits, for example, Dec 31 for image.module:
http://drupal.org/cvs?file=/modules/image/image.module

December 31, 2004
      Commit #12482 by Goba
      Image: /modules/image/image.module 1.138

  check for 'access images' permission on returning the block and the
page link (ported from 4.5)

      Commit #12481 by Goba
      Image: /modules/image/image.module 1.132.2.3 @ DRUPAL-4-5

  check for 'access images' permission on returning the block and the page link

As you can see, there is a commit in the DRUPAL-4-5 branch. If the
nightly build creats a 4.5.0, then we do have the problem I was
fearing.

On Sun, 13 Feb 2005 04:46:03 +0100, Bèr Kessels <berdrupal at tiscali.be> wrote:
> Op zaterdag 12 februari 2005 23:26, schreef K B:
> > Are we sure we are not falling into this trap?
> 
> AFAIK we are not. 4.5.1 contains the same code. 4.5.2 will be released as soon
> as enough important patches were committed to the 4.5 branch (not the 4.5.1
> release).
> 
> Regards,
>  Bèr
> --
>  [ Bèr Kessels | Drupal services www.webschuur.com ]
>