hbons/SparkleShare — Issue #491: Mac Client 4.0.2 not synching with own repo, console errors
Author: rebelmac
Created: 2011-12-21 11:17:48+00:00
State: open

Hey!

I just setup SparkleShare 4.0.2 on my MacPro and MacBook, both have Xcode installed (so git is available) - I've setup SparkleShare to use my own Repo on my MacMini which I use as a Server (Lion Client version installed with Xcode).

SparkleShare connects to the repo from both the MacPro and the MacBook . When I add a folder or modify the SparkleShare.txt file the change gets pushed to the repo from one machine, but on the other machine I get "Ouch" Mid-air collision!" Growl notifications and nothing is pulled. Instead the menubar icon shows a spinning star and I get the following console output:
-------
21.12.11 11:21:27,845 [0x0-0xfc0fc].org.sparkleshare.sparkleshare: 11:21:27 [Cmd] /Applications/SparkleShare.app/Contents/Resources/git/bin/git add --all
21.12.11 11:21:27,851 [0x0-0xfc0fc].org.sparkleshare.sparkleshare: 11:21:27 [Git][test] Changes staged
21.12.11 11:21:27,851 [0x0-0xfc0fc].org.sparkleshare.sparkleshare: 11:21:27 [Cmd] /Applications/SparkleShare.app/Contents/Resources/git/bin/git status --porcelain
21.12.11 11:21:27,859 [0x0-0xfc0fc].org.sparkleshare.sparkleshare: 11:21:27 [Cmd] /Applications/SparkleShare.app/Contents/Resources/git/bin/git commit -m "" --author="rxxxxx "
21.12.11 11:21:27,868 [0x0-0xfc0fc].org.sparkleshare.sparkleshare: 11:21:27 [Commit][test]
21.12.11 11:21:27,869 [0x0-0xfc0fc].org.sparkleshare.sparkleshare: 11:21:27 [Cmd] /Applications/SparkleShare.app/Contents/Resources/git/bin/git push origin master
21.12.11 11:21:27,965 [0x0-0xfc0fc].org.sparkleshare.sparkleshare: To ssh://rxxxxx@xxxxx.rxxxxx.com/Users/rxxxx/SparkleShare/test
21.12.11 11:21:27,965 [0x0-0xfc0fc].org.sparkleshare.sparkleshare: ! [rejected] master -> master (non-fast-forward)
21.12.11 11:21:27,965 [0x0-0xfc0fc].org.sparkleshare.sparkleshare: error: failed to push some refs to 'ssh://roland@xserve.rebelmac.com/Users/rxxxx/SparkleShare/test'
21.12.11 11:21:27,965 [0x0-0xfc0fc].org.sparkleshare.sparkleshare: To prevent you from losing history, non-fast-forward updates were rejected
21.12.11 11:21:27,965 [0x0-0xfc0fc].org.sparkleshare.sparkleshare: Merge the remote changes (e.g. 'git pull') before pushing again. See the
21.12.11 11:21:27,965 [0x0-0xfc0fc].org.sparkleshare.sparkleshare: 'Note about fast-forwards' section of 'git push --help' for details.
-------
(I x'ed out my connection details, anyway the login and keys are fine...)

When I do the git push/pull manually it gets updated just fine, it's just that SparkleShare is not doing this automatically.

I don't have no idea why... hope you can help!

Thanks!