[IPython-dev] git describe doesn't work?

[Matthias Bussonnier]

Le 24 sept. 2014 à 11:35, James Booth a écrit :

> Very strange timing, just this minute I am trying to diagnose a similar conda/git describe problem on our project menpo.
> 
> This seems like a pretty clear case of the git history just not being there though:
> 
> > git merge-base --is-ancestor rel-2.2.0 origin/master; echo $?
> 1 (false)
> 
> > git merge-base --is-ancestor rel-2.1.0 origin/master; echo $?
> 1 (false)
> 
> > git merge-base --is-ancestor rel-2.0.0 origin/master; echo $?
> 0 (true)
> 
> The commits which have been tagged as the last two releases (2.2.0, 2.1.0) are not ancestors of master, hence it's description as 'a lot more commits than rel-2.0.0'. Don't know enough about IPython releases to know whether than is intentional or not though!

Ah ! Yes, 2.0 has two children branches. 2.x and master. 
2.x have tags 2.1 and 2.2 (soon 2.3) 
master is child of 2.0.0. 

Having master child of 2.0  would imply rebasing master :-P 
-- 
M



> 
> Best
> James
> 
> 
> On 24 September 2014 10:33, Matthias Bussonnier <bussonniermatthias at gmail.com> wrote:
> 
> Le 24 sept. 2014 à 11:06, Dave Hirschfeld a écrit :
> 
> > I've observed that git describe doesn't seem to work properly with the
> > ipython repo which makes my conda dev builds have the wrong version
> > number.
> 
> What do you mean by do not work properly ?
> The things that you show below seem reasonable.
> --
> M
> 
> >
> > Not sure there is anything that can be done, but in case there is, it
> > would be nice to have git describe working.
> >
> > Thanks,
> > Dave
> >
> >
> > C:\dev\code\ipython [master...origin/master]> git describe --tags --
> > dirty
> > rel-2.0.0-1644-ga2e1c67
> >
> > C:\dev\code\ipython [master...origin/master]> git tag -l
> > dev-0.11
> > rel-0.10
> > rel-0.10.1
> > rel-0.10.2
> > rel-0.11
> > rel-0.12
> > rel-0.12.1
> > rel-0.13
> > rel-0.13.1
> > rel-0.13.2
> > rel-0.8.4
> > rel-0.9
> > rel-0.9.1
> > rel-1.0.0
> > rel-1.1.0
> > rel-1.2.0
> > rel-1.2.1
> > rel-2.0.0
> > rel-2.1.0
> > rel-2.2.0
> >
> >
> >
> > _______________________________________________
> > IPython-dev mailing list
> > IPython-dev at scipy.org
> > http://mail.scipy.org/mailman/listinfo/ipython-dev
> 
> _______________________________________________
> IPython-dev mailing list
> IPython-dev at scipy.org
> http://mail.scipy.org/mailman/listinfo/ipython-dev
> 
> _______________________________________________
> IPython-dev mailing list
> IPython-dev at scipy.org
> http://mail.scipy.org/mailman/listinfo/ipython-dev

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/ipython-dev/attachments/20140924/4aa0858d/attachment-0001.html>