Missing stuff from trunk and SAMBA_3_2 (Re: Opie build farm failure.)

Gerald (Jerry) Carter jerry at samba.org
Thu Oct 18 11:27:13 GMT 2007

Hash: SHA1

Stefan (metze) Metzmacher wrote:

> this was a crypto bug, as this patch was missing:
> http://gitweb.samba.org/?p=samba.git;a=commitdiff;h=b4746009735bf66b2578b884973c505b0363a79d
> And I assume there're much more important fixes 
> missing in v3-2-test.
> So everybody should carefully review, what gets dropped here:
> git show -p --stat 5c6c8e1fe93
> http://gitweb.samba.org/?p=samba.git;a=commitdiff;h=5c6c8e1fe93

Hmmm...That's disturbing.  Tracing the history:

  * Went into trunk with r16050
  * Went into SAMBA_3_0 with r16945 (Sync trunk -> 3.0
    for 3.0.24 code.)

    ....no full syncs of SAMBA_3_0 to a release branch
        from this point on.

  * SAMBA_3_0_24 was branched from SAMBA_3_0_23 (r19467)
  * SAMBA_3_0_24 was renamed to SAMBA_3_0_25 (r21153)
  * New SAMBA_3_0_24 was a security fix branched from
    the releases-3-0-24 tag (r22815)
  * SAMBA_3_0_26 was branched from SAMBA_3_0_25 (r22651)
  * SAMBA_3_2_0 was branched from SAMBA_3_0_26 (r23775)

So the missing code is really not a problem with the
history of the git v3-2-test branch per say.  It does
however highlight the weakness of having to manage so
many branches.  And the problem with relying on tests
against code that differs from what we will release.
Unless someone manually merged it into a release branch
(Under SVN),  We would have continued shipping releases
without this code.  So its probably a good thing that
we are now running what will be Samba 3.2.0 on the build

cheers, jerry
Samba                                    ------- http://www.samba.org
Centeris                         -----------  http://www.centeris.com
"What man is a man who does not make the world better?"      --Balian
Version: GnuPG v1.4.4 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org


More information about the samba-technical mailing list