JBQ
> --
> You received this message because you are subscribed to the "Android Building" mailing list.
> To post to this group, send email to android-...@googlegroups.com
> To unsubscribe from this group, send email to
> android-buildi...@googlegroups.com
> For more options, visit this group at
> http://groups.google.com/group/android-building?hl=en
>
--
Jean-Baptiste M. "JBQ" Queru
Software Engineer, Android Open-Source Project, Google.
Questions sent directly to me that have no reason for being private
will likely get ignored or forwarded to a public forum with no further
warning.
> There was an issue with the push such that at some point the tag
> wasn't pointing to the right commits. This has been fixed. 2.3.3_r1
> now correctly points to GRI40. Syncing should take care of things.
Syncing does *not* take care of things for users who have already got
the original tag since Git refuses to overwrite existing local tags.
If you know about this it's easy enough to do
repo forall -c 'git tag -d android-2.3.3_r1 && git fetch'
to get back on track again, but reaching all concerned with this
information isn't easy.
--
Magnus B�ck Opinions are my own and do not necessarily
SW Configuration Manager represent the ones of my employer, etc.
Sony Ericsson
I didn't see the situation myself since I was on vacation when that
push was done.
Would it make sense to re-tag with a separate tag (e.g. 2.3.3_r1.0)
and update the 2.3.3_r1 manifest to point to the new tag (along with a
new 2.3.3_r1.0 manifest).
JBQ
On Tue, Mar 1, 2011 at 11:35 PM, Magnus Bäck
<magnu...@sonyericsson.com> wrote:
> On Wednesday, March 02, 2011 at 02:14 CET,
> Jean-Baptiste Queru <j...@android.com> wrote:
>
>> There was an issue with the push such that at some point the tag
>> wasn't pointing to the right commits. This has been fixed. 2.3.3_r1
>> now correctly points to GRI40. Syncing should take care of things.
>
> Syncing does *not* take care of things for users who have already got
> the original tag since Git refuses to overwrite existing local tags.
> If you know about this it's easy enough to do
>
> repo forall -c 'git tag -d android-2.3.3_r1 && git fetch'
>
> to get back on track again, but reaching all concerned with this
> information isn't easy.
>
> --
> Magnus Bäck Opinions are my own and do not necessarily
> SW Configuration Manager represent the ones of my employer, etc.
> Sony Ericsson
>
> On Tue, Mar 1, 2011 at 11:35 PM, Magnus B�ck
> <magnu...@sonyericsson.com> wrote:
>
> > Syncing does *not* take care of things for users who have already
> > got the original tag since Git refuses to overwrite existing local
> > tags. If you know about this it's easy enough to do
> >
> > repo forall -c 'git tag -d android-2.3.3_r1 && git fetch'
> >
> > to get back on track again, but reaching all concerned with this
> > information isn't easy.
>
> Ugh, I didn't know that :(
>
> I didn't see the situation myself since I was on vacation when that
> push was done.
>
> Would it make sense to re-tag with a separate tag (e.g. 2.3.3_r1.0)
> and update the 2.3.3_r1 manifest to point to the new tag (along with
> a new 2.3.3_r1.0 manifest).
Perhaps, but the cat is already out of the bag -- there are and will
always be people with a bad tag in their workspaces. Creating a new
tag won't change any of that, but it might reduce the confusion for
newcomers (two seemingly identical tags always raises questions).
Purging the old tag might help with that.
This morning we pushed the updated tag to our server (which had been
polluted with the bad tag from a 3rd party supplier) and sent out
an email to all our developers asking them to delete the old tag
from all their workspaces. That's really all we can do, and we'll
probably think twice before listing refs/tags/android-2.3.3_r1 in
the revision attribute of any internal manifest.
--
Magnus B�ck Opinions are my own and do not necessarily
I'll push a new tag, and make the existing manifest point to the new
tag. It won't "fix" the bad tag, but that tag won't be referenced by
any manifest any more so the remaining badness will be harmless. The
"beauty" is that the manifest is referenced by branch, not by tag, so
we can update it after the fact.
JBQ
On Wed, Mar 2, 2011 at 10:07 AM, Magnus Bäck
<magnu...@sonyericsson.com> wrote:
> On Wednesday, March 02, 2011 at 16:56 CET,
> Jean-Baptiste Queru <j...@android.com> wrote:
>
>> On Tue, Mar 1, 2011 at 11:35 PM, Magnus Bäck
> Magnus Bäck Opinions are my own and do not necessarily
> SW Configuration Manager represent the ones of my employer, etc.
> Sony Ericsson
>
> thanks doing
>
> repo forall -c 'git tag -d android-2.3.3_r1 && git fetch'
> repo sync
>
> worked for me
You don't need both "repo sync" and "git fetch". The former will (unless
you specify the -n option) both download updates from the remote server,
download updates of the manifest itself, update the checked out commit
in each git, and rebase any topic branch that you have checked out.
This can sometimes be more than what you're willing to do, hence my
suggestion of running "git fetch" in each git. That will just download
updates from the server, including a fresh copy of the tag that you just
deleted. Whichever you prefer, just pick one of them.
JBQ
On Wed, Mar 2, 2011 at 2:13 PM, Magnus Bäck
<magnu...@sonyericsson.com> wrote:
> On Wednesday, March 02, 2011 at 20:54 CET,
> Ade Akinyooye <adeaki...@gmail.com> wrote:
>
>> thanks doing
>>
>> repo forall -c 'git tag -d android-2.3.3_r1 && git fetch'
>> repo sync
>>
>> worked for me
>
> You don't need both "repo sync" and "git fetch". The former will (unless
> you specify the -n option) both download updates from the remote server,
> download updates of the manifest itself, update the checked out commit
> in each git, and rebase any topic branch that you have checked out.
>
> This can sometimes be more than what you're willing to do, hence my
> suggestion of running "git fetch" in each git. That will just download
> updates from the server, including a fresh copy of the tag that you just
> deleted. Whichever you prefer, just pick one of them.
>
> --
> Magnus Bäck Opinions are my own and do not necessarily
> SW Configuration Manager represent the ones of my employer, etc.
> Sony Ericsson
>