Skip to content
Snippets Groups Projects
  1. Jun 30, 2011
    • Joey Hess's avatar
      cabal can now be used to build git-annex. · 56aeeb45
      Joey Hess authored
      This is substantially slower than using make, does not build or install
      documentation, does not run the test suite, and is not particularly
      recommended, but could be useful to some.
      56aeeb45
  2. Jun 29, 2011
  3. Jun 21, 2011
    • Joey Hess's avatar
      unlock: Made atomic. · 9f9e17aa
      Joey Hess authored
      9f9e17aa
    • Joey Hess's avatar
      move bug report · 53706ad9
      Joey Hess authored
      53706ad9
    • Joey Hess's avatar
      typo · a9a46491
      Joey Hess authored
      a9a46491
    • Joey Hess's avatar
      reorder git-union-merge params · 8b749d4b
      Joey Hess authored
      8b749d4b
    • Joey Hess's avatar
      allow git-union-merge to write to any ref · 01e8a0a9
      Joey Hess authored
      Not just refs/heads/* branches.
      01e8a0a9
    • Joey Hess's avatar
      sped up git-union-merge · d519bc71
      Joey Hess authored
      Avoided the slow git add, instead inject content directly into git and
      populate the index all in one pass. Now this runs on my large real-world
      repo in 10 seconds, which is acceptable.
      
      Also lots of code cleanups.
      d519bc71
    • Joey Hess's avatar
      add git-union-merge · c835166a
      Joey Hess authored
      This is a new git subcommand, that does a generic union merge operation
      between two refs, storing the result in a branch. It operates efficiently
      without touching the working tree. It does need to write out a temporary
      index file, and may need to write out some other temp files as well.
      
      This could be useful for anything that stores data in a branch,
      and needs to merge changes into that branch without actually checking the
      branch out. Since conflict handling can't be done without a working copy,
      the merge type is always a union merge, which is fine for data stored in
      log format (as git-annex does), or in non-conflicting files
      (as pristine-tar does).
      
      This probably belongs in git proper, but it will live in git-annex for now.
      
      ---
      
      Plan is to move .git-annex/ to a git-annex branch, and use git-union-merge
      to handle merging changes when pulling from remotes.
      
      Some preliminary benchmarking using real .git-annex/ data indicates
      that it's quite fast, except for the "git add" call, which is as slow
      as "git add" tends to be with a big index.
      c835166a
    • Joey Hess's avatar
      thought · 91e50782
      Joey Hess authored
      91e50782
    • Joey Hess's avatar
      update · 2fcb8e3b
      Joey Hess authored
      2fcb8e3b
    • Joey Hess's avatar
      update · e593a810
      Joey Hess authored
      e593a810
    • Joey Hess's avatar
      pointless golfing · bc731ba6
      Joey Hess authored
      bc731ba6
  4. Jun 20, 2011
  5. Jun 14, 2011
  6. Jun 13, 2011
  7. Jun 10, 2011
  8. Jun 09, 2011