search

scttnlsn / dandelion

Incremental Git repository deployment.
http://scttnlsn.github.io/dandelion
MIT License
738 stars 57 forks source link

Error: could not generate diff #48

Closed Ollo closed 10 years ago

Ollo commented 11 years ago

I'm attempting to use this with a WordPress installation on WPengine. when running status or deploy with an sftp config I receive:

Error: could not generate diff Try merging remote changes before running dandelion again

I'm working with their support team and they would like to know if there are specific permissions that need to be set on the .revision file in order for the diff to be generated?

Great tool for all other servers I've used it on so hoping to fit it into this workflow.

Regards,

scttnlsn commented 11 years ago

The .revision file needs to be readable in order to generate the diff but should also be writable so that Dandelion can save the latest deployed revision.

Ollo commented 11 years ago

hmm its currently set to 664 but it still producing that error. screen shot 2013-08-23 at 9 33 35 am screen shot 2013-08-23 at 9 33 53 am

I appreciate the help.

scttnlsn commented 11 years ago

Check the revision SHA in the remote .revision file. Is it ahead of what you're currently trying to deploy? If someone else deployed commits that are not in your local repository this could happen.

Try this locally:

$ git diff <remote_revision> HEAD

Where <remote_revision> is the SHA from .revision.

lightfuze commented 11 years ago

I'm also receiving this error. The SHA is the same in .revision as local commit...

lightfuze commented 11 years ago

My issue was due to an incorrect local path in the config file. I removed the local path option and the deploy works without error.

scttnlsn commented 11 years ago

@Ollo Is this still an issue for you?

renesijnke commented 10 years ago

Had the same issue. Removing the local path did the trick

scttnlsn commented 10 years ago

@renesijnke @lightfuze Did you both have an incorrect local path (i.e. directory that doesn't exist) or are you unable to specify anything as a local path?

renesijnke commented 10 years ago

My local path is correct (pwd command in terminal). My path is /Users/renesijnke/_kersvers/003 - projecten/019 - Arno Lubbinge/HTML. I also tried it with: /Users/renesijnke/_kersvers/003\ -\ projecten/019\ -\ Arno\ Lubbinge/HTML (escaped spaces)

Everything works perfect when I remove the local_path line in dandelion.yml

lightfuze commented 10 years ago

My local path exists and is correct: /Users/lightfuze/Sites/www

scttnlsn commented 10 years ago

The local_path needs to be a path relative to the root of the repository (not an absolute path). I'll make note of this in the README.