The test suite spits this out during the export import test:
unable to propigate merge commit Ref "4475560d4e3958521ad12e2715aeee244ea0cf78" back to Ref "refs/heads/master"
It does not fail, but I think this is actually an indication of a bug.
The ref is a merge commit, because it's imported a tree from a special remote, and merged it. Which is a reasonable thing to want to do, even when on an adjusted branch. So, this needs to be dealt with somehow. --Joey
There's a simple workaround, in fact. Make a git commit, any git commit. An empty commit will do:
git annex sync will be able to handle that commit, because it's not a merge commit.
It looks to me like this bug does not happen when
git annex mergeorgit annex sync --contentare used. There needs to have been a manualgit merge.In the test suite, it happens after a merge conflict occurs, and git add is run to resolve the conflict. When git-annex sync is then run, it results in the problem merge commit.
Do you have another way to reproduce this bug?
The test suite doesn't output that any more, so I'm going to assume this is fixed.