Please describe the problem.
Running git-annex merge shows the output "git-annex merge ", followed by a blinking cursor. The command never seems to end.
What steps will reproduce the problem?
What version of git-annex are you using? On what operating system?
4.20130827-gd04d9bb on MacOS X Mountain Lion
Please provide any additional information below.
dtruss output at https://www.dropbox.com/s/4b3yqn7ajfz5el2/annex-merge.log
The relevant part of the log is:
65332/0x53591a: open("/Users/gsolsberry/annex/.git/annex/journal.lck\0", 0x601, 0x1B6) = 8 0 65332/0x53591a: fcntl(0x8, 0x9, 0x107009D60) = -1 Err#-1waitToSetLock thinks fcntl is failing to lock the file due to something else having it locked, and retries, leading to the hang.
I'm told on irc that this was installed using the prebuilt image, and that a previous version of it didn't have the problem.
With latest 20130909 version, the following log from git-annex merge:
https://www.dropbox.com/s/3hklzfsflpxuk5s/annex-merge.log.1
This problem cleared up after a reboot (and a crash, apparently).