Change Details

[tasacora-env] /home/dereckson/dev/tasacora/tasacora-experimental ] arc patch D8 [8/910] Created and checked out branch arcpatch-D8. Downloading binary data for 'idTagDetector.cpython-34.pyc'... /tmp/4ovf17eoqm4gossc/25523-yTGYRz:68: trailing whitespace. /tmp/4ovf17eoqm4gossc/25523-yTGYRz:84: trailing whitespace. Checking patch .gitignore... Checking patch src/__pycache__/idTagDetector.cpython-34.pyc... Checking patch src/testIdTagDetector.py... Checking patch src/testSvgColourManager.py... Checking patch src/testSvgTreeManager.py... /tmp/4ovf17eoqm4gossc/25523-yTGYRz:68: new blank line at EOF. + Checking patch src/testSvgWheelManager.py... /tmp/4ovf17eoqm4gossc/25523-yTGYRz:84: new blank line at EOF. + Checking patch src/testXSLT.py... Applied patch .gitignore cleanly. Applied patch src/__pycache__/idTagDetector.cpython-34.pyc cleanly. Applied patch src/testIdTagDetector.py cleanly. Applied patch src/testSvgColourManager.py cleanly. Applied patch src/testSvgTreeManager.py cleanly. Applied patch src/testSvgWheelManager.py cleanly. Applied patch src/testXSLT.py cleanly. warning: 4 lines add whitespace errors. OKAY Successfully committed patch. [tasacora-env] /home/dereckson/dev/tasacora/tasacora-experimental ] git rebase master First, rewinding head to replay your work on top of it... Applying: modification de l'interpreteur executant le scrprit avec le bon path #!/usr/bin/env python3 Using index info to reconstruct a base tree... A src/__pycache__/idTagDetector.cpython-34.pyc M src/testSvgWheelManager.py <stdin>:74: trailing whitespace. <stdin>:91: trailing whitespace. <stdin>:74: new blank line at EOF. + <stdin>:91: new blank line at EOF. + warning: 4 lines add whitespace errors. Falling back to patching base and 3-way merge... Auto-merging src/testSvgWheelManager.py