search

scttnlsn / dandelion

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

Force deletion deltas to be handled before create/modify deltas #157

Closed dphoyes closed 7 years ago

dphoyes commented 7 years ago

This prevents issues when a diff converts a file/directory/symlink into one of the other types without changing its name.

Eg. The SFTP adapter is being used. A diff simultaneously deletes a directory and creates a normal file with the same name as the old directory. If the deletion is not handled first, the SFTP attempt to create the new file will fail, because a directory with the same name already exists.

scttnlsn commented 7 years ago

Good catch! Had not run into this edge case before. Thanks.

scttnlsn commented 7 years ago

Looks great. Could you squash the commits? Then I'll merge.

Thanks a lot!

dphoyes commented 7 years ago

Done

scttnlsn commented 7 years ago

Perfect. Thanks again.

scttnlsn commented 7 years ago

Available in v0.4.17

dphoyes commented 7 years ago

Thank you!