[Butia-devel-list] Jugando con remotos
Jorge
xxopxe en gmail.com
Lun Feb 27 11:47:07 UYST 2012
On lun, 2012-02-27 at 13:30 +0000, Alan Jhonn Aguiar Schwyn wrote:
>
>
> La única que se cambió fue la del followme.. eso te da error?
Se me queja de followme_plugin/followme/ ("deleted") y un monton en
turtle_art_plugin/followme ("added by them:", lo que sea que
signifique).
Al intentar hacer un merge me pasa esto:
jvisca en fofotimol:~/workspace/butia$ git status
# On branch toribio
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# toribio/nixiorator.lua
# toribio/queue.lua
# toribio/sched.lua
# toribio/scitesession
# toribio/strict.lua
# toribio/task_bobot_server.lua
# toribio/toribio-server.lua
nothing added to commit but untracked files present (use "git add" to
track)
jvisca en fofotimol:~/workspace/butia$ git merge master
Auto-merging pythonAPI/butiaAPI.py
Auto-merging turtle_art_plugin/butia/butia.py
Removing turtle_art_plugin/followme
Removing turtle_art_plugin/makexo
turtle_art_plugin/followme/NEWS: unmerged
(0e47733f90839ff00a69c3183936dfb6568fd595)
turtle_art_plugin/followme/__init__.py: unmerged
(e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)
turtle_art_plugin/followme/followme.py: unmerged
(79825f0fdaf732e95b6e52dfa9e2266e202d9411)
turtle_art_plugin/followme/icons/FollowMeoff.svg: unmerged
(928ea03dc4f458f7cd09e6f66938f29128a615a4)
turtle_art_plugin/followme/icons/FollowMeon.svg: unmerged
(6250feef545a412cbfd97eb8b4595f9fda83c80c)
turtle_art_plugin/followme/lib/pygame/__init__.py: unmerged
(1e8727edcf76711e0c9e321707ca0e8374be5712)
turtle_art_plugin/followme/lib/pygame/_arraysurfarray.so: unmerged
(4aa881ab8956af0fef07fb946908607043f70de9)
turtle_art_plugin/followme/lib/pygame/_camera.so: unmerged
(6b1f0b2dbda86c9c4d47ba3b75dc5c56e6037695)
turtle_art_plugin/followme/lib/pygame/_camera_opencv_highgui.py:
unmerged (7709c3c3af0c8fad45294023344c8151025891a8)
turtle_art_plugin/followme/lib/pygame/_camera_vidcapture.py: unmerged
(5b6a4f3f947d682f6b21077b1c31cbc15149ca0d)
...
fatal: git write-tree failed to write a tree
jvisca en fofotimol:~/workspace/butia$ git status
# On branch toribio
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# deleted: followme_plugin/followme/NEWS
# deleted: followme_plugin/followme/__init__.py
# deleted: followme_plugin/followme/followme.py
# deleted: followme_plugin/followme/icons/FollowMeoff.svg
# deleted: followme_plugin/followme/icons/FollowMeon.svg
# deleted: followme_plugin/followme/lib/pygame/__init__.py
# deleted: followme_plugin/followme/lib/pygame/_arraysurfarray.so
# deleted: followme_plugin/followme/lib/pygame/_camera.so
# deleted:
followme_plugin/followme/lib/pygame/_camera_opencv_highgui.py
# deleted: followme_plugin/followme/lib/pygame/_camera_vidcapture.py
# deleted: followme_plugin/followme/lib/pygame/_numericsndarray.so
# deleted: followme_plugin/followme/lib/pygame/_numericsurfarray.so
# deleted: followme_plugin/followme/lib/pygame/_numpysndarray.py
# deleted: followme_plugin/followme/lib/pygame/_numpysurfarray.py
# deleted: followme_plugin/followme/lib/pygame/base.so
# deleted: followme_plugin/followme/lib/pygame/bufferproxy.so
# deleted: followme_plugin/followme/lib/pygame/camera.py
# deleted: followme_plugin/followme/lib/pygame/cdrom.so
# deleted: followme_plugin/followme/lib/pygame/color.so
# deleted: followme_plugin/followme/lib/pygame/colordict.py
# deleted: followme_plugin/followme/lib/pygame/compat.py
# deleted: followme_plugin/followme/lib/pygame/constants.so
# deleted: followme_plugin/followme/lib/pygame/cursors.py
# deleted: followme_plugin/followme/lib/pygame/display.so
# deleted: followme_plugin/followme/lib/pygame/draw.so
# deleted: followme_plugin/followme/lib/pygame/event.so
# deleted: followme_plugin/followme/lib/pygame/fastevent.so
# deleted: followme_plugin/followme/lib/pygame/font.so
# deleted: followme_plugin/followme/lib/pygame/freesansbold.ttf
# deleted: followme_plugin/followme/lib/pygame/gfxdraw.so
# deleted: followme_plugin/followme/lib/pygame/gp2x/__init__.py
# deleted: followme_plugin/followme/lib/pygame/gp2x/constants.py
# deleted: followme_plugin/followme/lib/pygame/gp2x/locals.py
# deleted: followme_plugin/followme/lib/pygame/image.so
# deleted: followme_plugin/followme/lib/pygame/imageext.so
# deleted: followme_plugin/followme/lib/pygame/install.html
# deleted: followme_plugin/followme/lib/pygame/joystick.so
# deleted: followme_plugin/followme/lib/pygame/key.so
# deleted: followme_plugin/followme/lib/pygame/lgpl
# deleted: followme_plugin/followme/lib/pygame/locals.py
# deleted: followme_plugin/followme/lib/pygame/mac_scrap.py
# deleted: followme_plugin/followme/lib/pygame/macosx.py
# deleted: followme_plugin/followme/lib/pygame/mask.so
# deleted: followme_plugin/followme/lib/pygame/midi.py
# deleted: followme_plugin/followme/lib/pygame/mixer.so
# deleted: followme_plugin/followme/lib/pygame/mixer_music.so
# deleted: followme_plugin/followme/lib/pygame/mouse.so
# deleted: followme_plugin/followme/lib/pygame/movie.so
# deleted: followme_plugin/followme/lib/pygame/overlay.so
# deleted: followme_plugin/followme/lib/pygame/pixelarray.so
# deleted: followme_plugin/followme/lib/pygame/pkgdata.py
# deleted: followme_plugin/followme/lib/pygame/pygame.ico
# deleted: followme_plugin/followme/lib/pygame/pygame_icon.bmp
# deleted: followme_plugin/followme/lib/pygame/pygame_icon.icns
# deleted: followme_plugin/followme/lib/pygame/pygame_icon.svg
# deleted: followme_plugin/followme/lib/pygame/pygame_icon.tiff
# deleted: followme_plugin/followme/lib/pygame/pypm.so
# deleted: followme_plugin/followme/lib/pygame/readme.html
# deleted: followme_plugin/followme/lib/pygame/rect.so
# deleted: followme_plugin/followme/lib/pygame/rwobject.so
# deleted: followme_plugin/followme/lib/pygame/scrap.so
# deleted: followme_plugin/followme/lib/pygame/sndarray.py
# deleted: followme_plugin/followme/lib/pygame/sprite.py
# deleted: followme_plugin/followme/lib/pygame/surface.so
# deleted: followme_plugin/followme/lib/pygame/surfarray.py
# deleted: followme_plugin/followme/lib/pygame/surflock.so
# deleted: followme_plugin/followme/lib/pygame/sysfont.py
# deleted: followme_plugin/followme/lib/pygame/threads/Py25Queue.py
# deleted: followme_plugin/followme/lib/pygame/threads/__init__.py
# deleted: followme_plugin/followme/lib/pygame/time.so
# deleted: followme_plugin/followme/lib/pygame/transform.so
# deleted: followme_plugin/followme/lib/pygame/version.py
# deleted: followme_plugin/followme/po/es.po
# modified: lualibusb/Makefile
# modified: pythonAPI/butiaAPI.py
# modified: turtle_art_plugin/Makefile
# modified: turtle_art_plugin/butia/butia.py
# modified: turtle_art_plugin/butia/po/es.po
# deleted: turtle_art_plugin/followme
# modified: turtle_art_plugin/mainline
# deleted: turtle_art_plugin/makexo
# modified: turtle_art_plugin/sumtia/po/es.po
#
# Unmerged paths:
# (use "git reset HEAD <file>..." to unstage)
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# added by them: turtle_art_plugin/followme/NEWS
# added by them: turtle_art_plugin/followme/__init__.py
# added by them: turtle_art_plugin/followme/followme.py
# added by them: turtle_art_plugin/followme/icons/FollowMeoff.svg
# added by them: turtle_art_plugin/followme/icons/FollowMeon.svg
# added by them: turtle_art_plugin/followme/lib/pygame/__init__.py
# added by them:
turtle_art_plugin/followme/lib/pygame/_arraysurfarray.so
# added by them: turtle_art_plugin/followme/lib/pygame/_camera.so
# added by them:
turtle_art_plugin/followme/lib/pygame/_camera_opencv_highgui.py
# added by them:
turtle_art_plugin/followme/lib/pygame/_camera_vidcapture.py
# added by them:
turtle_art_plugin/followme/lib/pygame/_numericsndarray.so
# added by them:
turtle_art_plugin/followme/lib/pygame/_numericsurfarray.so
# added by them:
turtle_art_plugin/followme/lib/pygame/_numpysndarray.py
# added by them:
turtle_art_plugin/followme/lib/pygame/_numpysurfarray.py
# added by them: turtle_art_plugin/followme/lib/pygame/base.so
# added by them:
turtle_art_plugin/followme/lib/pygame/bufferproxy.so
# added by them: turtle_art_plugin/followme/lib/pygame/camera.py
# added by them: turtle_art_plugin/followme/lib/pygame/cdrom.so
# added by them: turtle_art_plugin/followme/lib/pygame/color.so
# added by them: turtle_art_plugin/followme/lib/pygame/colordict.py
# added by them: turtle_art_plugin/followme/lib/pygame/compat.py
# added by them: turtle_art_plugin/followme/lib/pygame/constants.so
# added by them: turtle_art_plugin/followme/lib/pygame/cursors.py
# added by them: turtle_art_plugin/followme/lib/pygame/display.so
# added by them: turtle_art_plugin/followme/lib/pygame/draw.so
# added by them: turtle_art_plugin/followme/lib/pygame/event.so
# added by them: turtle_art_plugin/followme/lib/pygame/fastevent.so
# added by them: turtle_art_plugin/followme/lib/pygame/font.so
# added by them:
turtle_art_plugin/followme/lib/pygame/freesansbold.ttf
# added by them: turtle_art_plugin/followme/lib/pygame/gfxdraw.so
# added by them:
turtle_art_plugin/followme/lib/pygame/gp2x/__init__.py
# added by them:
turtle_art_plugin/followme/lib/pygame/gp2x/constants.py
# added by them:
turtle_art_plugin/followme/lib/pygame/gp2x/locals.py
# added by them: turtle_art_plugin/followme/lib/pygame/image.so
# added by them: turtle_art_plugin/followme/lib/pygame/imageext.so
# added by them: turtle_art_plugin/followme/lib/pygame/install.html
# added by them: turtle_art_plugin/followme/lib/pygame/joystick.so
# added by them: turtle_art_plugin/followme/lib/pygame/key.so
# added by them: turtle_art_plugin/followme/lib/pygame/lgpl
# added by them: turtle_art_plugin/followme/lib/pygame/locals.py
# added by them: turtle_art_plugin/followme/lib/pygame/mac_scrap.py
# added by them: turtle_art_plugin/followme/lib/pygame/macosx.py
# added by them: turtle_art_plugin/followme/lib/pygame/mask.so
# added by them: turtle_art_plugin/followme/lib/pygame/midi.py
# added by them: turtle_art_plugin/followme/lib/pygame/mixer.so
# added by them:
turtle_art_plugin/followme/lib/pygame/mixer_music.so
# added by them: turtle_art_plugin/followme/lib/pygame/mouse.so
# added by them: turtle_art_plugin/followme/lib/pygame/movie.so
# added by them: turtle_art_plugin/followme/lib/pygame/overlay.so
# added by them:
turtle_art_plugin/followme/lib/pygame/pixelarray.so
# added by them: turtle_art_plugin/followme/lib/pygame/pkgdata.py
# added by them: turtle_art_plugin/followme/lib/pygame/pygame.ico
# added by them:
turtle_art_plugin/followme/lib/pygame/pygame_icon.bmp
# added by them:
turtle_art_plugin/followme/lib/pygame/pygame_icon.icns
# added by them:
turtle_art_plugin/followme/lib/pygame/pygame_icon.svg
# added by them:
turtle_art_plugin/followme/lib/pygame/pygame_icon.tiff
# added by them: turtle_art_plugin/followme/lib/pygame/pypm.so
# added by them: turtle_art_plugin/followme/lib/pygame/readme.html
# added by them: turtle_art_plugin/followme/lib/pygame/rect.so
# added by them: turtle_art_plugin/followme/lib/pygame/rwobject.so
# added by them: turtle_art_plugin/followme/lib/pygame/scrap.so
# added by them: turtle_art_plugin/followme/lib/pygame/sndarray.py
# added by them: turtle_art_plugin/followme/lib/pygame/sprite.py
# added by them: turtle_art_plugin/followme/lib/pygame/surface.so
# added by them: turtle_art_plugin/followme/lib/pygame/surfarray.py
# added by them: turtle_art_plugin/followme/lib/pygame/surflock.so
# added by them: turtle_art_plugin/followme/lib/pygame/sysfont.py
# added by them:
turtle_art_plugin/followme/lib/pygame/threads/Py25Queue.py
# added by them:
turtle_art_plugin/followme/lib/pygame/threads/__init__.py
# added by them: turtle_art_plugin/followme/lib/pygame/time.so
# added by them: turtle_art_plugin/followme/lib/pygame/transform.so
# added by them: turtle_art_plugin/followme/lib/pygame/version.py
# added by them: turtle_art_plugin/followme/po/es.po
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# toribio/nixiorator.lua
# toribio/queue.lua
# toribio/sched.lua
# toribio/scitesession
# toribio/strict.lua
# toribio/task_bobot_server.lua
# toribio/toribio-server.lua
jvisca en fofotimol:~/workspace/butia$
J.
Más información sobre la lista de distribución Butia-devel-l