yade-dev team mailing list archive

[Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>]

On 28/11/13 14:06, Jérôme Duriez wrote:
> Sorry (also) for this, I understand finally now that this is linked
> with the auto rebase. It's now configured also on my PC..

Thanks for fixing the problem. Yes you absolutely need autorebase, else
it will be always the same mess.
I'm not sure it is the cause of the first problem (why the "grow" line
disappeared in your first commit), but you must do it anyway.

An example of what could have led to your situation:
1. edit utils.py
2. git pull
3. save utils.py (overriding the update from "pull")
4. commit
5. push

Whatever the reason. It should never have been pushed because "git diff"
just before the commit should have reveal the upcoming mistake.
Please always double-check what you commit before commiting.

Bruno

>
>
> Le 28/11/2013 13:58, noreply@xxxxxxxxxxxxx a écrit :
>> Merge authors:
>>   Anton Gladky (gladky-anton)
>>   Anton Gladky (gladky-anton)
>>   Bruno Chareyre (bruno-chareyre)
>>   Jan Stránský (honzik)
>> ------------------------------------------------------------
>> revno: 3752 [merge]
>> committer: Jerome Duriez <jerome.duriez@xxxxxxxxxxxxxxx>
>> timestamp: Thu 2013-11-28 10:45:15 +0100
>> message:
>>   Merge branch 'master' of github.com:yade/trunk
>> added:
>>   examples/baraban/BicyclePedalEngine.py
>>   pkg/common/Grid_GUI.cpp
>>   scripts/ppa/
>>   scripts/ppa/createtar.py
>> modified:
>>   CMakeLists.txt
>>   README.rst
>>   doc/sphinx/installation.rst
>>   lib/triangulation/FlowBoundingSphere.ipp
>>   lib/triangulation/FlowBoundingSphereLinSolv.ipp
>>   lib/triangulation/PeriodicFlow.cpp
>>   lib/triangulation/def_types.h
>>   pkg/common/Grid.cpp
>>   pkg/common/KinematicEngines.cpp
>>   pkg/common/KinematicEngines.hpp
>>   pkg/dem/FlowEngine.cpp
>>   pkg/dem/FlowEngine.hpp
>>   py/_utils.cpp
>>   scripts/checks-and-tests/checks/DEM-PFV-check.py
>>
>>
>> --
>> lp:yade
>> https://code.launchpad.net/~yade-pkg/yade/git-trunk
>>
>> Your team Yade developers is subscribed to branch lp:yade.
>> To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription
>>
>>
>> _______________________________________________
>> Mailing list: https://launchpad.net/~yade-dev
>> Post to     : yade-dev@xxxxxxxxxxxxxxxxxxx
>> Unsubscribe : https://launchpad.net/~yade-dev
>> More help   : https://help.launchpad.net/ListHelp
>
> -- 
> Jérôme Duriez
> Post-Doctorant UJF
> Laboratoire 3SR
> Bureau E139 - 04.56.52.86.30
>
>
> _______________________________________________
> Mailing list: https://launchpad.net/~yade-dev
> Post to     : yade-dev@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~yade-dev
> More help   : https://help.launchpad.net/ListHelp


-- 
_______________
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
________________