Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | rebase on top of updated original branch | 2016-03-03 | |
| | |||
* | fix abs filepath generation | 2016-03-03 | |
| | |||
* | change name of adjusted branches to eg adjusted/master(unlocked) | 2016-03-03 | |
| | | | | | | | Using adjusted/unlocked/master made lots of git stuff dealing with "master" complain that it was ambiguous. This new appoach is more like view branch names, and shows the adjustment right there in the branch display even if only the basename of the branch is shown. | ||
* | working toward adjusted commit propigation | 2016-03-03 | |
| | |||
* | Merge branch 'master' into adjustedbranch | 2016-03-03 | |
|\ | |||
* | | can't checkout adjusted branch while index is still locked | 2016-03-03 | |
| | | | | | | | | | | | | | | There's a race here, but entering an adjusted branch for the first time is not something to do when a commit is being made at the same time. Although, may want to prevent the assistant from committing while entering the adjusted branch. | ||
* | | push original branch, not adjusted branch | 2016-03-03 | |
| | | |||
| * | fix windows build | 2016-03-03 | |
| | | |||
* | | replicate git's message about an existing lock file | 2016-03-03 | |
| | | |||
* | | lock index while making index-less commits | 2016-03-03 | |
| | | | | | | | | | | Avoids race with another git commit at the same time adjusted branch is being updated. | ||
* | | support for git-style lock files, on unix and windows | 2016-03-03 | |
| | | |||
| * | Merge branch 'master' of ssh://git-annex.branchable.com | 2016-03-03 | |
| |\ | |||
| * | | fix windows build | 2016-03-03 | |
| | | | |||
| | * | (no commit message) | 2016-03-03 | |
| | | | |||
| | * | (no commit message) | 2016-03-03 | |
| | | | |||
| | * | (no commit message) | 2016-03-03 | |
| | | | |||
| | * | (no commit message) | 2016-03-03 | |
| | | | |||
| | * | Added a comment: Thanks | 2016-03-02 | |
| |/ | |||
| * | comment | 2016-03-02 | |
| | | |||
| * | Merge branch 'master' of ssh://git-annex.branchable.com | 2016-03-02 | |
| |\ | |||
| * | | Fix metadata hook behavior when multiple files are added at once. Thanks, ↵ | 2016-03-02 | |
| | | | | | | | | | | | | Klaus Ethgen. | ||
| | * | Added a comment | 2016-03-01 | |
| |/ | |||
| * | followup | 2016-03-01 | |
| | | |||
| * | Added a comment | 2016-03-01 | |
| | | |||
| * | update | 2016-03-01 | |
| | | |||
| * | followup | 2016-03-01 | |
| | | |||
| * | comment | 2016-03-01 | |
| | | |||
| * | clarify | 2016-03-01 | |
| | | |||
| * | Merge branch 'master' of ssh://git-annex.branchable.com | 2016-03-01 | |
| |\ | |||
| * | | Fix shared lock file FD leak. | 2016-03-01 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes behavior in this situation: l1 <- lockShared Nothing "lck" l2 <- lockShared Nothing "lck" dropLock l1 dropLock l2 Before, the lock was dropped upon the second dropLock call, but the fd remained open, and would never be closed while the program was running. Fixed by a rather round-about method, but it should work well enough. It would have been simpler to open open the shared lock once, and not open it again in the second call to lockShared. But, that's difficult to do atomically. This also affects Windows and PID locks, not just posix locks. In the case of pid locks, multiple calls to waitLock within the same process are allowed because the side lock is locked using a posix lock, and so multiple exclusive locks can be taken in the same process. So, this change fixes a similar problem with pid locks. l1 <- waitLock (Seconds 1) "lck" l2 <- waitLock (Seconds 1) "lck" dropLock l1 dropLock l2 Here the l2 side lock fd remained open but not locked, although the pid lock file was removed. After this change, the second dropLock will close both fds to the side lock, and delete the pidlock. | ||
| | * | Added a comment | 2016-03-01 | |
| | | | |||
| | * | Added a comment | 2016-03-01 | |
| | | | |||
| | * | Added a comment: recent snapshot seems has fixed it | 2016-03-01 | |
| | | | |||
| * | | comment | 2016-03-01 | |
| | | | |||
| | * | Added a comment: more info | 2016-03-01 | |
| |/ | |||
| * | moreinfo | 2016-03-01 | |
| | | |||
| * | Fix bug preventing moving files to/from a repository with annex.pidlock set. | 2016-03-01 | |
| | | |||
| * | comment typo fix | 2016-03-01 | |
| | | |||
| * | Fix data loss that can occur when annex.pidlock is set in a repository. | 2016-03-01 | |
| | | |||
| * | comment | 2016-03-01 | |
| | | |||
| * | comment | 2016-03-01 | |
| | | |||
| * | reopen | 2016-03-01 | |
| | | |||
| * | comment | 2016-03-01 | |
| | | |||
| * | Added a comment: similar problem | 2016-03-01 | |
| | | |||
| * | Added a comment | 2016-03-01 | |
| | | |||
| * | initial whining | 2016-03-01 | |
| | | |||
| * | (no commit message) | 2016-03-01 | |
| | | |||
| * | Merge branch 'master' of ssh://git-annex.branchable.com | 2016-02-29 | |
| |\ | |||
| * | | devblog | 2016-02-29 | |
| | | | |||
* | | | need to update master | 2016-02-29 | |
| | | |