yade-dev team mailing list archive

[Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>]

hi,

thanks for response on this commit. revert is no problem for me. good  
to know that changing coding style is not wanted. recently i was  
thinking about changing another file. now i know, that i should not do  
it.

> Please re-apply the meaningful changes if any.

ok, i will have a look next week.

wish you a nice weekend,

christian


Zitat von Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>:

> Thank you Christian for improving the documentation.
> But, please, don't change indentation of source code. In the long  
> run it makes it more difficult to track real history of the code  
> (and in that case the indentation was not bad, you just changed one  
> style for another).
> Do you have problems with long lines? Most editors can display them nicely.
> Another problem of formating commits is they tend to generate more  
> conflicts between commiters since you change many lines at once  
> (problem I had just now).
> I reverted this commit. It helped me to fix the conflicts,  
> unfortunately the lines reverted will still appear as modified  
> twice, so the file history is not improved...
> Please re-apply the meaningful changes if any.
>
> Cheers
> Bruno
>
> On 24/07/14 19:34, noreply@xxxxxxxxxxxxx wrote:
> > ------------------------------------------------------------
> > revno: 4114
> > committer: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
> > timestamp: Thu 2014-07-24 09:33:43 +0200
> > message:
> >   fix typos and indents; cut long lines in  
> > TriaxialStressController; bit more documentation of stressMask
> > modified:
> >   pkg/dem/TriaxialStressController.cpp
> >   pkg/dem/TriaxialStressController.hpp
> >
> >
> > --
> > 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
>
>
> --
> _______________
> 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
> ________________