yade-dev team mailing list archive

[Václav Šmilauer <eudoxos@xxxxxxxx>]

Hi, this is not problem in code itself but on your machine. This <<<<<<
TREE etc was inserted by bzr whe you were updating your local branch as
there was conflict between your local change and upstream change. See
"bzr help conflicts". To simply forget your local changes, do "bzr
revert py/pack/pack.py".

** Changed in: yade
       Status: New => Invalid

-- 
RegularHex Pack, again
https://bugs.launchpad.net/bugs/550912
You received this bug notification because you are a member of Yade
developers, which is subscribed to Yade.

Status in Yet Another Dynamic Engine: Invalid

Bug description:
Hi Vaclav,
in file pack.py for RegularHex pack in bzr2112
I think  y+= hy/2  must be  y+= hy/3 
 also,when run it there is an error:

File "/home/moradi/YADE-trunk/YADE/lib/yade-bzr2112/py/yade/pack.py", line 206
     <<<<<<< TREE
      ^
 SyntaxError: invalid syntax

in file there are these lines:
<<<<<<< TREE
		if k%2!=0: x+=a/2.; y+=h/3.
=======
		if k%2!=0: x+=a/2.; y+=hy/2.
>>>>>>> MERGE-SOURCE

thank you
Nasibeh Moradi