Julien BLACHE schrieb: > Ilia Sotnikov <hostcc at gmail.com> wrote: > > Hi, > >> ** Updating scanners lists >> From git://git.debian.org/sane/sane-backends >> 764aa7c..e232f54 master -> origin/master >> Updating 354b9a5..e232f54 >> backend/.gitignore: needs update >> frontend/.gitignore: needs update >> include/sane/.gitignore: needs update >> tools/.gitignore: needs update >> error: Entry 'backend/.gitignore' not uptodate. Cannot merge. >> error: hooks/post-receive exited with error code 128 > > Hmm fixed by checking out the problematic files and pulling > manually. Don't know what happened, we'll see if it reoccurs. > > JB. >
Hi, the post-receive hook failed again: > ** Updating scanners lists > From git://git.debian.org/sane/sane-backends > 6462162..34717f1 master -> origin/master > Updating 6462162..34717f1 > Fast forward > ChangeLog | 20 ++ > backend/abaton.c | 16 +- > backend/agfafocus.c | 16 +- > backend/apple.c | 16 +- > backend/artec.c | 12 +- > backend/artec_eplus48u.c | 4 +- > backend/as6e.h | 2 +- > backend/avision.c | 16 +- > backend/bh.c | 12 +- > backend/canon.c | 10 +- > backend/canon_dr.c | 12 +- > backend/cardscan.c | 10 +- > backend/coolscan.c | 18 +- > backend/coolscan2.c | 2 +- > backend/coolscan3.c | 18 +- > backend/dc210.c | 12 +- > backend/dc240.c | 12 +- > backend/dc25.c | 10 +- > backend/dll.c | 10 +- > backend/dmc.c | 14 +- > backend/epjitsu.c | 10 +- > backend/epson.c | 16 +- > backend/epson2-io.c | 8 +- > backend/epson2.c | 16 +- > backend/epson2.h | 6 +- > backend/epson2_net.c | 12 +- > backend/epson2_net.h | 2 +- > backend/epson2_scsi.c | 4 +- > backend/epson2_scsi.h | 2 +- > backend/epson_scsi.c | 4 +- > backend/epson_scsi.h | 2 +- > backend/epson_usb.c | 2 +- > backend/fujitsu.c | 12 +- > backend/genesys.c | 2 +- > backend/genesys.conf.in | 3 + > backend/genesys_devices.c | 82 ++++++ > backend/genesys_gl646.c | 586 +------------------------------------- > backend/genesys_gl646.h | 634 > +++++++++++++++++++++++++++++++++++++++++ > backend/genesys_gl841.c | 2 +- > > backend/genesys_low.h | 2 + > > backend/gphoto2.c | 12 +- > > backend/gt68xx.c | 2 +- > > backend/hp-accessor.c | 2 +- > > backend/hp-device.c | 2 +- > > backend/hp-handle.c | 6 +- > > backend/hp-hpmem.c | 2 +- > > backend/hp-option.c | 6 +- > > backend/hp-scl.c | 10 +- > > backend/hp.c | 14 +- > > backend/hp.h | 4 +- > > backend/hp3500.c | 14 +- > > backend/hp5590.c | 10 +- > > backend/hp5590_cmds.c | 4 +- > > backend/hp5590_low.c | 6 +- > > backend/hp5590_low.h | 2 +- > > backend/lexmark_low.c | 2 +- > > backend/microtek.c | 16 +- > > backend/microtek2.c | 2 +- > > backend/mustek.c | 2 +- > > backend/nec.c | 12 +- > > backend/pie.c | 16 +- > > backend/pint.c | 10 +- > > backend/pixma_mp150.c | 7 +- > > backend/plustek-usbio.c | 4 +- > > backend/qcam.c | 12 +- > > backend/qcam.h | 2 +- > > backend/ricoh.c | 12 +- > > backend/rts88xx_lib.c | 2 +- > > backend/s9036.c | 14 +- > > backend/sharp.c | 10 +- > > backend/sm3840.h | 2 +- > > backend/snapscan.c | 4 +- > > backend/sp15c.c | 16 +- > > backend/st400.c | 16 +- > > backend/stubs.c | 2 +- > > backend/tamarack.c | 18 +- > > backend/test.c | 2 +- > > backend/umax-usb.c | 2 +- > > backend/umax.c | 18 +- > > backend/xerox_mfp.c | 14 +- > > doc/descriptions/genesys.desc | 17 +- > > frontend/scanimage.c | 2 +- > > sanei/sanei_DomainOS.c | 6 +- > > sanei/sanei_ab306.c | 12 +- > > sanei/sanei_codec_ascii.c | 2 +- > > sanei/sanei_config.c | 8 +- > sanei/sanei_config2.c | 8 +- > sanei/sanei_jpeg.c | 2 +- > sanei/sanei_pa4s2.c | 14 +- > sanei/sanei_pio.c | 12 +- > sanei/test_wire.c | 12 +- > tools/check-usb-chip.c | 2 +- > 92 files changed, 1110 insertions(+), 949 deletions(-) > create mode 100644 backend/genesys_gl646.h > chgrp: changing group of > `/org/alioth.debian.org/chroot/home/groups/sane/lists/sane-backends-external.html': > Operation not permitted > chgrp: changing group of > `/org/alioth.debian.org/chroot/home/groups/sane/lists/sane-backends-cvs.html': > Operation not permitted > chgrp: changing group of > `/org/alioth.debian.org/chroot/home/groups/sane/lists/sane-mfgs-cvs.html': > Operation not permitted > chgrp: changing group of > `/org/alioth.debian.org/chroot/home/groups/sane/lists': Operation not > permitted > error: hooks/post-receive exited with error code 1 Regards, Pierre
