search

rmayr / dvcs-autosync

dvcs-autosync is a project to create an open source replacement for Dropbox/Wuala/Box.net/etc. based on distributed version control systems (DVCS). It offers nearly instantaneous mutual updates when a file is added or changes on one side but with the added benefit of (local, distributed) versioning and does not rely on a centralized service provider.
http://www.mayrhofer.eu.org/dvcs-autosync
Other
98 stars 14 forks source link

there should be a "safetycheckcmd" to avoid trying to commit in some cases #13

Open Dieterbe opened 13 years ago

Dieterbe commented 13 years ago

Specifically, the case where a merge conflict occurs. In this case the user needs to resolve the conflict manually first (which causes a bunch of file writes/deletes/updates), but dvcs-autosync may only do its job after the version control system says it's safe to do so (i.e. the conflict has been resolved) for this we could introduce something like a safetycheckcmd configuration variable, this command could inspect the .git folder (although I couldn't figure out where it stores the information that a directory is currently in conflict) before performing any other action.

rmayr commented 12 years ago

Good idea. We would need to define this command for the used version control systems, though.