f4ba19f2b8
The bug was in movein, which just replaceFile'd the file with a symlink, even if it already had the desired content, before trying to pull the content out of the annex and replace the symlink with it. That was ok-ish for non conflicted merges, where if the file existed it would be an old version of the content. But for conflicted merges, the automatic merge resolver has already run, and will have already put the desired content into the file for the local variant. Also, made removeDirect not trust that the associated files map is correct. Only if it can verify that another file has the content will it not move it into .git/annex/objects. |
||
|---|---|---|
| .. | ||
| changelog | ||
| compat | ||
| control | ||
| copyright | ||
| doc-base | ||
| menu | ||
| NEWS | ||
| rules | ||