summaryrefslogtreecommitdiff
path: root/GitUnionMerge.hs
Commit message (Collapse)AuthorAge
* fix merge_tree_indexGravatar Joey Hess2011-06-23
| | | | | --cached is needed when calling git-diff-index, as it is not diffing against currently checked out branch.
* add journaling to speed up changes to the git-annex branchGravatar Joey Hess2011-06-23
| | | | | | | | git is slow when the index file is large and has to be rewritten each time a file is changed. To speed this up, added a journal where changes are recorded before being fed into the index file and committed to the git-annex branch. The entire journal can be fed into git with just 2 commands, and only one write of the index file.
* merge bugfixGravatar Joey Hess2011-06-22
| | | | | Use GitRepo functions to call git, the bug occurred when it was run in a git repo that was not the same as the repo being acted on.
* rework core merge codeGravatar Joey Hess2011-06-22
| | | | More likely to be 100% correct now, I think.
* allow for union merges between a tree and the content in the indexGravatar Joey Hess2011-06-21
| | | | | | | | | | | | | | | This is needed for robust handling of the git-annex branch. Since changes are staged to its index as git-annex runs, and committed at the end, it's possible that git-annex is interrupted, and leaves a dirty index. When it next runs, it needs to be able to merge the git-annex branch as necessary, without losing the existing changes in the index. Note that this assumes that the git-annex branch is only modified by git-annex. Any changes to it will be lost when git-annex updates the branch. I don't see a good, inexpensive way to find changes in the git-annex branch that arn't in the index, and union merging the git-annex branch into the index every time would likewise be expensive.
* export the commit function and generalizeGravatar Joey Hess2011-06-21
|
* Branch module completeGravatar Joey Hess2011-06-21
| | | | Refactored some code that it needs into GitRepo.
* refactorGravatar Joey Hess2011-06-21
|
* moved to libraryGravatar Joey Hess2011-06-21