← Back to team overview

yade-dev team mailing list archive

Re: huh? Re: [Branch ~yade-pkg/yade/git-trunk] 828 revisions removed

 

On 10/10/14 00:06, Janek Kozicki wrote:
>> 828 revisions were removed from the branch.
> what just happened?
>
It is a git joke. Chao merged his branch into trunk. In git words, it
looks like all revisions in the last 2 years have been removed and you
don't see them re-applied.
As far as I understand, they are actually re-applied through merge
commits originally pushed to Chao's branch when he was getting sync vs.
upstream.
I checked a random selection of recent commits and they are still here.
I don't think anything has been really rolled back.
The 100 or so commit mails from yesterday are just the list of all
commits to Chao's branch in the last years.
Let me know if you find something wrong.

Bruno

-- 
_______________
Bruno Chareyre
Associate Professor
ENSE³ - Grenoble INP
Lab. 3SR
BP 53
38041 Grenoble cedex 9
Tél : +33 4 56 52 86 21
Fax : +33 4 76 82 70 43
________________



Follow ups

References