To: WalterBright

In current, the head of 'staging' branch in each repositories is misplaced and does not reflect newest beta zip content.

To fix the problem, I opened tree pull request.

https://github.com/D-Programming-Language/dmd/pull/1656 https://github.com/D-Programming-Language/druntime/pull/409 https://github.com/D-Programming-Language/phobos/pull/1130

These pulls merge master changes changes into staging branch.
After merging, the lastest 'staging' branch points correct "v2.062-b1" tag
position.

After merging them in github website, you should forcely re-tagging and push "v2.062-b1" tag to github remote repository.

--- commang example
# fetch all remote branches
git fetch upstream

# Forcely re-tagging
git tag -f v2.062-b1 upstream/staging~0

# Push tag to remote
git push upstream v2.062-b1
---
You should do above commands at each your dmd/druntime/phobos directories.

Kenji Hara

Also let's not forget d-programming-language.

Andrei

On 2/11/13 4:59 AM, kenji hara wrote:
> To: WalterBright
>
> In current, the head of 'staging' branch in each repositories is
> misplaced and does not reflect newest beta zip content.
>
> To fix the problem, I opened tree pull request.
>
> https://github.com/D-Programming-Language/dmd/pull/1656
> https://github.com/D-Programming-Language/druntime/pull/409
> https://github.com/D-Programming-Language/phobos/pull/1130
>
> These pulls merge master changes changes into staging branch.
> After merging, the lastest 'staging' branch points correct "v2.062-b1"
> tag position.
>
> After merging them in github website, you should forcely re-tagging and
> push "v2.062-b1" tag to github remote repository.
>
> --- commang example
> # fetch all remote branches
> git fetch upstream
>
> # Forcely re-tagging
> git tag -f v2.062-b1 upstream/staging~0
>
> # Push tag to remote
> git push upstream v2.062-b1
> ---
> You should do above commands at each your dmd/druntime/phobos directories.
>
> Kenji Hara
>
>
> _______________________________________________
> dmd-internals mailing list
> dmd-internals@puremagic.com
> http://lists.puremagic.com/mailman/listinfo/dmd-internals
_______________________________________________
dmd-internals mailing list
dmd-internals@puremagic.com
http://lists.puremagic.com/mailman/listinfo/dmd-internals

On 2/11/2013 1:59 AM, kenji hara wrote:
>
> --- commang example
> # fetch all remote branches
> git fetch upstream

How is that different from "git remote update" ?

>
> # Forcely re-tagging
> git tag -f v2.062-b1 upstream/staging~0

What is the ~0 for?

>
> # Push tag to remote
> git push upstream v2.062-b1
> ---
> You should do above commands at each your dmd/druntime/phobos directories.
>
>

_______________________________________________
dmd-internals mailing list
dmd-internals@puremagic.com
http://lists.puremagic.com/mailman/listinfo/dmd-internals

Walter Bright, el 11 de February a las 12:21 me escribiste:
> 
> On 2/11/2013 1:59 AM, kenji hara wrote:
> >
> >--- commang example
> ># fetch all remote branches
> >git fetch upstream
> 
> How is that different from "git remote update" ?

git fetch upstream will only fetch new stuff from the upstream remote repository and will set the FETCH_HEAD reference.

git remove update will fetch new stuff from all the remote repositories without touching FETCH_HEAD.

> ># Forcely re-tagging
> >git tag -f v2.062-b1 upstream/staging~0
> 
> What is the ~0 for?

It has no effect, I don't know why he used it. REF~N is used to specify the Nth commit before the reference REF (for example HEAD~3 is 3 commits before HEAD, and is the same as specifying HEAD^^^). So REF~0 is the same as REF.

-- 
Leandro Lucarella (AKA luca)                     http://llucax.com.ar/
----------------------------------------------------------------------
GPG Key: 5F5A8D05 (F8CD F9A7 BF00 5431 4145  104C 949E BFB6 5F5A 8D05)
----------------------------------------------------------------------
"CIRILO" Y "SIRACUSA" DE "SEÑORITA MAESTRA": UNO MUERTO Y OTRO PRESO
	-- Crónica TV
_______________________________________________
dmd-internals mailing list
dmd-internals@puremagic.com
http://lists.puremagic.com/mailman/listinfo/dmd-internals

2013/2/12 Leandro Lucarella <luca@llucax.com.ar>

> Walter Bright, el 11 de February a las 12:21 me escribiste:
> >
> > On 2/11/2013 1:59 AM, kenji hara wrote:
> > >
> > >--- commang example
> > ># fetch all remote branches
> > >git fetch upstream
> >
> > How is that different from "git remote update" ?
>
> git fetch upstream will only fetch new stuff from the upstream remote repository and will set the FETCH_HEAD reference.
>
> git remove update will fetch new stuff from all the remote repositories without touching FETCH_HEAD.


Because I always control remotes origin and upstream separately. You can use "git remote update" instead.


> > ># Forcely re-tagging
> > >git tag -f v2.062-b1 upstream/staging~0
> >
> > What is the ~0 for?
>
> It has no effect, I don't know why he used it. REF~N is used to specify the Nth commit before the reference REF (for example HEAD~3 is 3 commits before HEAD, and is the same as specifying HEAD^^^). So REF~0 is the same as REF.


Yes, it is no effect, but a tag sticks always to a commit, not branch.
The form "REF~0" definitely represents a commit object, even if REF refers
a branch.
I used it in order to make the command more descriptive.

Kenji Hara

On 2/11/2013 4:37 PM, kenji hara wrote:
> 2013/2/12 Leandro Lucarella <luca@llucax.com.ar <mailto:luca@llucax.com.ar>>
>
>     Walter Bright, el 11 de February a las 12:21 me escribiste:
>     >
>     > On 2/11/2013 1:59 AM, kenji hara wrote:
>     > >
>     > >--- commang example
>     > ># fetch all remote branches
>     > >git fetch upstream
>     >
>     > How is that different from "git remote update" ?
>
>     git fetch upstream will only fetch new stuff from the upstream remote
>     repository and will set the FETCH_HEAD reference.
>
>     git remove update will fetch new stuff from all the remote repositories
>     without touching FETCH_HEAD.
>
>
> Because I always control remotes origin and upstream separately. You can use "git remote update" instead.
>
>     > ># Forcely re-tagging
>     > >git tag -f v2.062-b1 upstream/staging~0
>     >
>     > What is the ~0 for?
>
>     It has no effect, I don't know why he used it. REF~N is used to specify
>     the Nth commit before the reference REF (for example HEAD~3 is 3 commits
>     before HEAD, and is the same as specifying HEAD^^^). So REF~0 is the
>     same as REF.
>
>
> Yes, it is no effect, but a tag sticks always to a commit, not branch.
> The form "REF~0" definitely represents a commit object, even if REF refers a
> branch.
> I used it in order to make the command more descriptive.
>
> Kenji Hara
>

Thanks, I thought the ~0 was tty noise!

On 2/11/2013 1:59 AM, kenji hara wrote:
> To: WalterBright
>
> In current, the head of 'staging' branch in each repositories is misplaced and does not reflect newest beta zip content.
>
> To fix the problem, I opened tree pull request.
>
> https://github.com/D-Programming-Language/dmd/pull/1656 https://github.com/D-Programming-Language/druntime/pull/409 https://github.com/D-Programming-Language/phobos/pull/1130
>
> These pulls merge master changes changes into staging branch.
> After merging, the lastest 'staging' branch points correct "v2.062-b1" tag
> position.
>
> After merging them in github website, you should forcely re-tagging and push "v2.062-b1" tag to github remote repository.
>
> --- commang example
> # fetch all remote branches
> git fetch upstream
>
> # Forcely re-tagging
> git tag -f v2.062-b1 upstream/staging~0

mercury ~/forks/dmd> git tag -f v2.062-b1 upstream/staging~0 fatal: Failed to resolve 'upstream/staging~0' as a valid ref.


>
> # Push tag to remote
> git push upstream v2.062-b1
> ---
> You should do above commands at each your dmd/druntime/phobos directories.
>
> Kenji Hara
>
>
> _______________________________________________
> dmd-internals mailing list
> dmd-internals@puremagic.com
> http://lists.puremagic.com/mailman/listinfo/dmd-internals

On 2/11/2013 1:59 AM, kenji hara wrote:
>
> After merging them in github website, you should forcely re-tagging and push "v2.062-b1" tag to github remote repository.
>

I think I did it correctly.
_______________________________________________
dmd-internals mailing list
dmd-internals@puremagic.com
http://lists.puremagic.com/mailman/listinfo/dmd-internals

2013/2/12 Walter Bright <walter@digitalmars.com>

>
> On 2/11/2013 1:59 AM, kenji hara wrote:
>
>>
>> After merging them in github website, you should forcely re-tagging and push "v2.062-b1" tag to github remote repository.
>>
>>
> I think I did it correctly.


OK, it was correctly done.

https://github.com/D-Programming-Language/dmd/commits/v2.062-b1<https://github.com/D-Programming-Language/dmd/commits/v2.062-b1~0>
https://github.com/D-Programming-Language/druntime/commits/v2.062-b1
https://github.com/D-Programming-Language/phobos/commits/v2.062-b1

Thanks!

Kenji Hara

kenji hara, el 12 de February a las 09:37 me escribiste:
> > It has no effect, I don't know why he used it. REF~N is used to specify the Nth commit before the reference REF (for example HEAD~3 is 3 commits before HEAD, and is the same as specifying HEAD^^^). So REF~0 is the same as REF.
> 
> 
> Yes, it is no effect, but a tag sticks always to a commit, not branch.
> The form "REF~0" definitely represents a commit object, even if REF refers
> a branch.
> I used it in order to make the command more descriptive.

Technically nothing can refer to a branch, branches are just labels and are always resolved to commits too :)

-- 
Leandro Lucarella (AKA luca)                     http://llucax.com.ar/
----------------------------------------------------------------------
GPG Key: 5F5A8D05 (F8CD F9A7 BF00 5431 4145  104C 949E BFB6 5F5A 8D05)
----------------------------------------------------------------------
UNA ARTISTA HACE JABONES CON SU PROPIA GRASA LUEGO DE UNA LIPOSUCCION
	-- Crónica TV
_______________________________________________
dmd-internals mailing list
dmd-internals@puremagic.com
http://lists.puremagic.com/mailman/listinfo/dmd-internals