Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2012-02-09 21:53:51 -04:00
commit fa77d9486d
3 changed files with 23 additions and 0 deletions

View file

@ -0,0 +1,7 @@
My annex contains several large files that I have unlocked, edited, and committed again, i.e. the annex contains the version history of those files. However, I don't want the history -- keeping the latest version is good enough for me. Running `git annex unused` won't detect those old versions, though, because they aren't unused as old Git revisions still refer to them. So I wonder:
1. What is the best way to get rid of the old versions of files in the annex?
2. What is the best way to detect old versions of files in the annex?
I guess, I could run `git rebase -i` to squash commits to those files into one commit, thereby getting rid of the references to the old copies, but that approach feels awkward and error prone. Is anyone aware of a better way?

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://peter-simons.myopenid.com/"
ip="77.186.179.173"
subject="comment 1"
date="2012-02-09T18:53:00Z"
content="""
Sorry for commmenting on my own question ... I think I just figured out that `git annex unused` *does* in fact do what I want. When I tried it, it just didn't show the obsolete versions of the files I edited because I hadn't yet synchronized all repositories, so that was why the obsolete versions were still considered used.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joey.kitenet.net/"
nickname="joey"
subject="comment 2"
date="2012-02-09T19:42:28Z"
content="""
Yes, contents are still considered used while tags or refs refer to them. Including remote tracking branches like `remotes/origin/master`
"""]]