openstack team mailing list archive

[John Dickinson <me@xxxxxx>]

The code that was on github was an unofficial mirror that I was maintaining. With each release, I added the tag to github repo. It looks like I didn't tag at the same commit as the (at the time) official repo. This is because the milestone-proposed branch did not exist in the unofficial github mirror.

When we moved to github, I think the code that was already there was used (why reimport if everything is already there?). This is what lead to the tag discrepancy. There is no significant difference in the eg 1.4.1 tags between what's tagged now and what was tagged in bzr. The only difference should be the final versioning. Functionally, the code at each of the two tags should be identical.

I apologize for the discrepancy. I think the risk of future problems is much lower now that the github repo is officially managed.

--John


On Sep 29, 2011, at 8:09 AM, Bailey, Darragh wrote:

> Hi,
> 
> 
> I originally imported the swift milestone-proposed branch  (lp:~hudson-openstack/swift/milestone-proposed) from launchpad into a git repository locally, sometime after the 1.4.1 release and synced again after the 1.4.2. This was before it was clear that the swift project was definitely moving to use git and the repo on github would definitely be the public git repo.
> 
> 
> In looking to now switch to pulling from the project repo on github and I've noticed a few discrepancies.
> 
> Tag 1.4.1 within my local repo, which was imported from bzr, points to a different commit than what the github repository points to. I'm wondering how that has come to be?
> 
> github points to the following commit as being 1.4.1
> $ git ls-remote openstack | grep refs/tags/1.4.1
> 9ab33970b58b8219245bfd89e2ad9442c0e94f17    refs/tags/1.4.1
> 
> (https://github.com/openstack/swift/commit/9ab33970b58b8219245bfd89e2ad9442c0e94f17)
> 
> $ git log -n1 9ab33970b58b8219245bfd89e2ad9442c0e94f17
> commit 9ab33970b58b8219245bfd89e2ad9442c0e94f17
> Merge: 8526098 c4f0b55
> Author: John Dickinson <john.dickinson@xxxxxxxxxxxxx><mailto:john.dickinson@xxxxxxxxxxxxx>
> Date:   Tue Jun 14 16:37:02 2011 +0000
> 
>    updated changelog for 1.4.1
> 
> 
> Bzr points to the following change as being tagged for 1.4.1:
> http://bazaar.launchpad.net/~hudson-openstack/swift/milestone-proposed/revision/305
> 
> *   Committer: Tarmac
> *   Author(s): Thierry Carrez
> *   Date: 2011-06-20 14:42:27
> *   mfrom: (304.1.1 milestone-proposed)<http://bazaar.launchpad.net/%7Ehudson-openstack/swift/milestone-proposed/revision/304.1.1>
> *   Revision ID: tarmac-20110620144227-n6ko7ns5s83aceh9
> 
> Tags: 1.4.1
> Final 1.4.1 versioning for immediate release.
> 
> 
> Looking at the imported repo in git, I can see the following differences between what is tagged in github versus what was tagged in launchpad.
> 
> (openstack is the remote name I have for https://github.com/openstack/swift.git)
> $ git log --graph --decorate --right-only $(git ls-remote openstack | grep refs/tags/1.4.1 | awk '{print $1'})...1.4.1
> *   commit d8f39dbaaeab646117b8267a33c606a21dbef29b (tag: 1.4.1, origin/upstream/milestone-proposed)
> |\  Merge: 3ad61bd 1dec5d4
> | | Author: Thierry Carrez <thierry@xxxxxxxxxxxxx><mailto:thierry@xxxxxxxxxxxxx>
> | | Date:   Mon Jun 20 14:42:27 2011 +0000
> | |
> | |     Final 1.4.1 versioning for immediate release.
> | |
> | * commit 1dec5d45c82a92fde49d7d7ba478cebce52fc162
> |/  Author: Thierry Carrez <thierry@xxxxxxxxxxxxx><mailto:thierry@xxxxxxxxxxxxx>
> |   Date:   Mon Jun 20 14:37:17 2011 +0200
> |
> |       Final 1.4.1 versioning
> |
> *   commit 3ad61bd15cdf90b91c3834c6444e56a4d4436bd6
> |\  Merge: 60f9cbf d41490c
> | | Author: David Goetz <david.goetz@xxxxxxxxxxxxx><mailto:david.goetz@xxxxxxxxxxxxx>
> | | Date:   Wed Jun 15 14:57:34 2011 +0000
> | |
> | |     Merge 1.4.1 development from trunk (rev312)
> | |
> | * commit d41490c38477205c6619a8c79857973474497bad
> |/  Merge: 60f9cbf 9ab3397
> |   Author: Thierry Carrez <thierry@xxxxxxxxxxxxx><mailto:thierry@xxxxxxxxxxxxx>
> |   Date:   Wed Jun 15 11:11:51 2011 +0200
> |
> |       Merge 1.4.1 development from trunk (rev312)
> |
> <snip 2 additional commits>
> 
> Commit d41490c38477205c6 merges the commit marked as 1.4.1 in github (9ab33970b58b82192) onto the milestone-proposed branch from launchpad.
> 
> 
> I've looked at the tags from bzr on launchpad and confirmed that they point to same changes as my local tree for 1.4.1, so I'm wondering was the tag moved on launchpad sometime after the import into the github repository?
> 
> 
> I see a similar thing happening with the 1.4.2 tag. What is tagged in github is not quite the same as the tag imported from launchpad. Also confirmed that the import of the tag from bzr to my local git repo is pointing to the same data, so it looks like the tags on launchpad for swift for 1.4.1 and 1.4.2 don't match what is tagged in github.
> 
> $ git log --graph --decorate --right-only $(git ls-remote openstack | grep refs/tags/1.4.2 | awk '{print $1'})...1.4.2
> *   commit c4f718ff7c565d7b40e10c881506be009e6cbbd7 (tag: 1.4.2, bzr/upstream/milestone-propose
> |\  Merge: 389e407 c509923
> | | Author: Thierry Carrez <thierry@xxxxxxxxxxxxx><mailto:thierry@xxxxxxxxxxxxx>
> | | Date:   Wed Jul 27 14:33:19 2011 +0000
> | |
> | |     Final 1.4.2 versioning
> | |
> | * commit c5099233521ce7d90e985aa32a5e156b48a7b4c4
> |/  Author: Thierry Carrez <thierry@xxxxxxxxxxxxx><mailto:thierry@xxxxxxxxxxxxx>
> |   Date:   Wed Jul 27 15:58:51 2011 +0200
> |
> |       Final 1.4.2 versioning
> |
> *   commit 389e4071ddd34037f2b1f7eb13c59b49256ed82d
> |\  Merge: d8f39db f9092e2
> | | Author: gholt <gholt@xxxxxxxxxxxxx><mailto:gholt@xxxxxxxxxxxxx>
> | | Date:   Tue Jul 26 09:08:37 2011 +0000
> | |
> | |     Merge 1.4.2 development from trunk (rev331)
> | |
> | * commit f9092e20a41dba3fe616bd7573deaa46cbdadcb3
> |/  Merge: d8f39db a9c0a26
> |   Author: Thierry Carrez <thierry@xxxxxxxxxxxxx><mailto:thierry@xxxxxxxxxxxxx>
> |   Date:   Tue Jul 26 10:42:21 2011 +0200
> |
> |       Merge 1.4.2 development from trunk (rev331)
> 
> <snip commits to do with 1.4.1>
> 
> Commit a9c0a26 is what is tagged in github as the 1.4.2 release, but commit c4f718ff7c565 is what comes in with the import from launchpad using git-bzr-ng.
> 
> Also wondering if the milestone-proposed branch is getting deleted and recreated each time in github? Which would explain why each time I do comparisons it looks like the milestone-proposed branch in github doesn't share the same history after commit de49be3929d as the milestone-proposed branch in launchpad since ?
> 
> 
> I also see odd things when looking at the glance repo on github, where the commit tagged for diablo-4 is not associated with any branch? Wondering if the same process resulted in that? This does have the effect of meaning you have to explicitly pull the tag in order to get the additional commits associated with it, as it doesn't get pulled across automatically with either of the two branches there.
> 
> 
> --
> Regards,
> Darragh Bailey
> 
> Systems Software Engineer
> Hewlett Packard Galway Ltd.
> +353 91 75-4674
> 
> Postal Address:    Hewlett Packard Galway Limited, Ballybrit Business Park, Galway
> Registered Office: Hewlett Packard Galway Limited, 63-74 Sir John Rogerson's Quay Dublin 2
> Registered Number: 361933
> 
> _______________________________________________
> The contents of this message and any attachments to it are confidential and may be legally privileged. If you have received this message in error you should delete it from your system immediately and advise the sender.
> To any recipient of this message within HP, unless otherwise stated you should consider this message and attachments as "HP CONFIDENTIAL".
> 
> 
> 
> _______________________________________________
> Mailing list: https://launchpad.net/~openstack
> Post to     : openstack@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~openstack
> More help   : https://help.launchpad.net/ListHelp

Attachment: smime.p7s
Description: S/MIME cryptographic signature