[Pkg-samba-maint] LTS work in pkg-samba Git repository?

Sat May 20 13:40:18 UTC 2017

On Thu, May 18, 2017 at 09:12:55PM +0200, Mathieu Parent wrote:
> 
> It looks like I forgot to set the proper recipient:-(
> 
> Now that you have the permissions and that you know it, can you please
> push your changes to the wheezy branch ?
> 

Hi Mathieu,

I am ready to push the changes.  However, I had to first import the DSC
for samba_3.6.6-6+deb7u10.dsc.  For some reason, git-buildpackage
created a merge commit for that one:

commit 9168750add015cfba777b7d6a5f35f3fe15efbe3 (tag: debian/2%3.6.6-6+deb7u10)
Merge: a541859 ff4e466
Author: Santiago Ruano Rincón <santiagorr at riseup.net>
Date:   Wed Jun 8 20:17:48 2016 +0200

    Imported Debian patch 2:3.6.6-6+deb7u10

Here is the graph of the log:

* 762a3af (HEAD, tag: debian/2%3.6.6-6+deb7u12, wheezy) Imported Debian patch 2:3.6.6-6+deb7u12
* 715d280 (tag: debian/2%3.6.6-6+deb7u11) Imported Debian patch 2:3.6.6-6+deb7u11
*   9168750 (tag: debian/2%3.6.6-6+deb7u10) Imported Debian patch 2:3.6.6-6+deb7u10
|\  
| * ff4e466 (tag: upstream/3.6.6) Load samba-3.6.6 into branches/samba/upstream.
| * dd59b3a (tag: upstream/3.6.5) Load samba-3.6.5 into branches/samba/upstream.
| * 099e0ba (tag: upstream/3.6.4) Load samba-3.6.4 into branches/samba/upstream.
| * 62120f7 (tag: upstream/3.6.3) Load samba-3.6.3 into branches/samba/upstream.
| * cb25bc5 (tag: upstream/3.6.2) Load samba-3.6.2 into branches/samba/upstream.
| * 5f021ee (tag: upstream/3.5.11_dfsg) Load samba-3.5.11 into branches/samba/upstream.
| * a0ecb11 (tag: upstream/3.5.10_dfsg) Load samba-3.5.10 into branches/samba/upstream.
| * 055c182 (tag: upstream/3.5.9_dfsg) Load samba-3.5.9~dfsg into branches/samba/upstream.
| * e64520a Revert upstream branch to 3.5.8....oops
| * 6fe9013 Load samba-3.6.0rc2 into branches/samba/upstream.
| * 4d16e8d (tag: upstream/3.5.8_dfsg) Load samba-3.5.8 into branches/samba/upstream.
| * 9fbd797 (tag: upstream/3.5.7) Load samba-3.5.7 into branches/samba/upstream.
| * fc9deef (tag: upstream/3.5.6_dfsg) Load samba-3.5.6 into branches/samba/upstream.
| * e6fa974 (tag: upstream/3.5.5_dfsg) Load samba-3.5.5 into branches/samba/upstream.
| * 53601fa Merge 3.5.4 in upstream branch
| * 1b77db9 (tag: upstream/3.4.8_dfsg) Load samba-3.4.8 into branches/samba/upstream.
| * 07f55c1 (tag: upstream/3.4.7_dfsg) Load samba-3.4.7 into branches/samba/upstream.
| * d68d99d (tag: upstream/3.4.6_dfsg) Load samba-3.4.6 into branches/samba/upstream.
| * 0ff834b Load samba-3.4.5 into branches/samba/upstream.
| * 6348eb3 Load samba-3.4.5 into branches/samba/upstream.
| * f894c63 (tag: upstream/3.4.4) Load samba-3.4.4 into branches/samba/upstream.
| * a2772c3 (tag: upstream/3.4.3) Load samba-3.4.3 into branches/samba/upstream.
| * 3539d15 (tag: upstream/3.4.2) Load samba-3.4.2 into branches/samba/upstream.
| * 4e05235 (tag: upstream/3.4.1) Load samba-3.4.1 into branches/samba/upstream.
| * e2df061 (tag: upstream/3.4.0) Load samba-3.4.0 into branches/samba/upstream.
| * 130ad4c (tag: upstream/3.3.6) Load samba-3.3.6 into branches/samba/upstream.
| * 8299c61 (tag: upstream/3.3.5) Load samba-3.3.5 into branches/samba/upstream.
| * b12e32b (tag: upstream/3.3.4) Load samba-3.3.4 into branches/samba/upstream.
| * c44a229 (tag: upstream/3.3.3) Load samba-3.3.3 into branches/samba/upstream.
| * 60b302f (tag: upstream/3.3.2) Load samba-3.3.2 into branches/samba/upstream.
| * 7a15735 (tag: upstream/3.3.1) Load samba-3.3.1 into branches/samba/upstream.
| * ca16c95 Merge samba-3.3.0 into branches/samba/upstream.
| * d113059 (tag: upstream/3.2.5) Load samba-3.2.5 into branches/samba/upstream.
| * a2b71a0 Revert the merge of 3.3.0~pre2 in upstream branch
| * 2203bd5 (tag: upstream/3.3.0_pre2) Load samba-3.3.0pre2 into branches/samba/upstream.
| * f168797 (tag: upstream/3.2.4) Load samba-3.2.4 into branches/samba/upstream.
| * 0623b47 (tag: upstream/3.2.3) Load samba-3.2.3 into branches/samba/upstream.
| * a5ca4db (tag: upstream/3.2.2) Load samba-3.2.2 into branches/samba/upstream.
| * 68aa843 (tag: upstream/3.2.1) Load samba-3.2.1 into branches/samba/upstream.
| *   d3d0a1b upstream-3.2 branch is now the upstream branch
| |\  
| | * f9e6081 (tag: upstream/3.2.0-gobble, tag: upstream/3.2.0) Load samba-3.2.0 into branches/samba/upstream-3.2.
| | * 6149bff (tag: upstream/3.2.0_rc2) Load samba-3.2.0rc2 into branches/samba/upstream-3.2.
| | * 0381e17 (tag: upstream/3.2.0_rc1) Load samba-3.2.0rc1 into branches/samba/upstream-3.2.
| | * bba625b (tag: upstream/3.2.0_pre2) Load samba-3.2.0pre2 into branches/samba/upstream-3.2.
| | * 74a2535 Creating directory for import
| * d6e5134 (tag: upstream/3.0.31) Load samba-3.0.31 into branches/samba/upstream.
| * 1bf2961 take 3.2.0rc2 back off of the upstream branch; everything should now be in order
| * 36f015c (tag: upstream/3.2.0rc2) Load samba-3.2.0rc2 into branches/samba/upstream.
| * 9c742a9 (tag: upstream/3.0.30) Load samba-3.0.30 into branches/samba/upstream.
| * 695ee7a Load samba-3.0.29 into branches/samba/upstream.
| * c3f02f9 Load samba-3.0.29 into branches/samba/upstream.
| * 8f965ab (tag: upstream/3.0.28a) Load samba-3.0.28a into branches/samba/upstream.
| * 868390f (tag: upstream/3.0.28) Load samba-3.0.28 into branches/samba/upstream.
| * f56c937 whoops, put the branch under the package name
| * 58b3757 (tag: upstream/3.0.27a) Load samba-3.0.27a into branches/upstream.
| * f24db24 Creating directory for import
* a541859 (origin/wheezy) changelog for previous entry

As you can see, a541859 was the last commit on the wheezy branch, which
represented the partial work that was done on 3.6.6-6+deb7u10 by Andrew,
which Santiago later completed.  But the commit of 3.6.6-6+deb7u10 also
brought in everything on the upstream branch going back for some time.
The output of 'git status' after this tells me that my local wheezy
branch is ahead by 57 commits.  After this I can commit 3.6.6-6+deb7u11
and my changes for 3.6.6-6+deb7u12 and those behave normally, as
expected.

My question is whether is OK for me to push this as it is?  I would have
expected the merge of the upstream branch to have taken place when
3.6.6-1 was first packaged.  I don't want to make a mess of your
repository, so I thought I would ask to be sure this is correct.

Regards,

-Roberto

-- 
Roberto C. Sánchez