Merge branch 'master' of ssh://git-annex.branchable.com
This commit is contained in:
Joey Hess
commit
eaaa3315d7
10 changed files with 141 additions and 4 deletions
|
|
@ -0,0 +1,40 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawn26WQjIP5fnMgQF_L_k3Q3UrR5v8mjRTY"
|
||||
nickname="Ellis"
|
||||
subject="comment 2"
|
||||
date="2013-04-02T20:18:05Z"
|
||||
content="""
|
||||
*Are you sure these files did not already have the same content before you ran git-annex on them?*
|
||||
|
||||
Yes, each one was a distinct photo, video, or audio recording. The only operation performed between creation and ``git annex add`` was moving them into the import directory from the command line via e.g. ``mv /sdcard/DCIM/Camera/* .``.
|
||||
|
||||
If you'd like, I'll try to find a set of files to reproduce the problem with.
|
||||
|
||||
*Can you show me the output of git show when run on some of these files?*
|
||||
|
||||
Sure. Here are two WAV files. The first one was correctly stored, and the second one is now a duplicate of the first.
|
||||
|
||||
commit bb282af90745c8a50e74c1f724e6cc708bfa9591
|
||||
Author: Ellis Whitehead <ellis@****>
|
||||
Date: Mon Apr 1 17:05:19 2013 +0200
|
||||
|
||||
git-annex automatic sync
|
||||
|
||||
diff --git a/import/2013-03-02_13-57-08_jeromin.wav b/import/2013-03-02_13-57-08_jeromin.wav
|
||||
new file mode 120000
|
||||
index 0000000..55a8cf1
|
||||
--- /dev/null
|
||||
+++ b/import/2013-03-02_13-57-08_jeromin.wav
|
||||
@@ -0,0 +1 @@
|
||||
+../.git/annex/objects/VG/vf/SHA256E-s49222316--acd9b8f94981543c601461c4cb602dae4e7d9d9a72654a3915c6e9d0221791b7.wav/SHA256E-s49222316--acd9b8f94981543c601461c4cb602dae4e7d9d9a72654a3915c6e9d0221791b7.wav
|
||||
\ No newline at end of file
|
||||
diff --git a/import/2013-03-02_14-06-11_karina.wav b/import/2013-03-02_14-06-11_karina.wav
|
||||
new file mode 120000
|
||||
index 0000000..55a8cf1
|
||||
--- /dev/null
|
||||
+++ b/import/2013-03-02_14-06-11_karina.wav
|
||||
@@ -0,0 +1 @@
|
||||
+../.git/annex/objects/VG/vf/SHA256E-s49222316--acd9b8f94981543c601461c4cb602dae4e7d9d9a72654a3915c6e9d0221791b7.wav/SHA256E-s49222316--acd9b8f94981543c601461c4cb602dae4e7d9d9a72654a3915c6e9d0221791b7.wav
|
||||
\ No newline at end of file
|
||||
|
||||
"""]]
|
||||
|
|
@ -23,6 +23,6 @@ The [[polls/goals_for_April]] poll results are in.
|
|||
continue working on bugs as they're reported.
|
||||
* I'm not sure what to make of the 10% who want me to add direct mode support.
|
||||
Since direct mode is already used by default, perhaps they want
|
||||
me to take time off? :) (I certianly need to fix the
|
||||
[[Direct_mode_keeps_re-checksuming_duplicated_files]] bug, and one other
|
||||
me to take time off? :) (I certainly need to fix the
|
||||
[[bugs/Direct_mode_keeps_re-checksuming_duplicated_files]] bug, and one other
|
||||
direct mode bug I discovered yesterday.)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://dzsino.myopenid.com/"
|
||||
nickname="dzsino"
|
||||
subject="I've voted for git-remote-gcrypt because.."
|
||||
date="2013-04-02T09:07:23Z"
|
||||
content="""
|
||||
... as important a Windows port seems for git-annex to really take off (IMO), I would welcome encrypted repos for storing stuff on external drives: directory special remotes feel kinda cumbersome for me, I would rather use full blown repos.
|
||||
"""]]
|
||||
|
|
@ -8,6 +8,6 @@ assistant, please instead fill in this poll on behalf of less technically
|
|||
adept friends or family -- what's preventing you from introducing them to
|
||||
the assistant?
|
||||
|
||||
[[!poll open=yes expandable=yes 8 "I'm using the assistant!" 25 "I need a Windows port" 30 "I need an Android port" 3 "I need an IPhone port (not holding my breath)" 2 "Well, it's still in beta..." 11 "I want to, but have not had the time to try it" 5 "Just inertia. I've got this dropbox/whatever that already works.." 3 "It's too hard to install (please say why in comments)" 2 "Perceived recent increase of bug reports and thus sitting it out." 24 "Initially the lack of direct-mode. Now concerns about the safety of direct mode. Perhaps after the next release." 9 "I haven't always well understood the differences between commandline operation & the assistant, so the differences would confuse me, and I found the command line more understandable & less scary. Now trying to learn to like & trust the assistant. :)" 19 "An Ubuntu PPA would be supercool! Thanks for your great work!!" 18 "Not yet in Debian sid amd64" 6 "Waiting for Fedora/CentOS rpm repository." 2 "throttling transfers, it upsets people when I saturate the connection" 2 "partial content" 1 "Not yet available in macports" 4 "No build yet for Nokia N9" 3 "Using only git-annex webapp to config does not seem to work: Create walkthough?" 5 "No build for OSX 10.6" 5 "Needs more focus on the UI." 1 "Just inertia. I don't have a Dropbox/whatever." 4 "Replaces files with a symlink mess." 2 "configurable option to only annex files meeting certian size or filename criteria" 4 "I'm really confused about how to make it sync with a remote NON-bare repository. I'm even afraid to try `git remote add`, since there is no clear method to completely forget a git-annex remote..." 2 "A build for te raspberry pi would be supercol!" 1 "Would be nice to exclude subfolders from the gui or through a config file" 1 "I wish I had transparently encrypted git repos in the cloud available, like jgit." 1 "too many inodes used in direct mode. maybe it's possible to keep more info as git objects instead?" 2 "I need to be able to restrict in which repo dirs changes get auto-committed" 1 "Provide .deb package" 1 "Better documentation/walkthroughs on using git-annex within an existing git repo. AKA mixed use" 1 "Union mounts to have a single view of file collection on the network" 1 "Ubuntu PPA does not build with webapp"]]
|
||||
[[!poll open=yes expandable=yes 8 "I'm using the assistant!" 25 "I need a Windows port" 30 "I need an Android port" 3 "I need an IPhone port (not holding my breath)" 2 "Well, it's still in beta..." 11 "I want to, but have not had the time to try it" 5 "Just inertia. I've got this dropbox/whatever that already works.." 3 "It's too hard to install (please say why in comments)" 2 "Perceived recent increase of bug reports and thus sitting it out." 25 "Initially the lack of direct-mode. Now concerns about the safety of direct mode. Perhaps after the next release." 9 "I haven't always well understood the differences between commandline operation & the assistant, so the differences would confuse me, and I found the command line more understandable & less scary. Now trying to learn to like & trust the assistant. :)" 20 "An Ubuntu PPA would be supercool! Thanks for your great work!!" 18 "Not yet in Debian sid amd64" 6 "Waiting for Fedora/CentOS rpm repository." 2 "throttling transfers, it upsets people when I saturate the connection" 2 "partial content" 1 "Not yet available in macports" 4 "No build yet for Nokia N9" 3 "Using only git-annex webapp to config does not seem to work: Create walkthough?" 5 "No build for OSX 10.6" 5 "Needs more focus on the UI." 1 "Just inertia. I don't have a Dropbox/whatever." 4 "Replaces files with a symlink mess." 2 "configurable option to only annex files meeting certian size or filename criteria" 4 "I'm really confused about how to make it sync with a remote NON-bare repository. I'm even afraid to try `git remote add`, since there is no clear method to completely forget a git-annex remote..." 2 "A build for te raspberry pi would be supercol!" 1 "Would be nice to exclude subfolders from the gui or through a config file" 1 "I wish I had transparently encrypted git repos in the cloud available, like jgit." 1 "too many inodes used in direct mode. maybe it's possible to keep more info as git objects instead?" 2 "I need to be able to restrict in which repo dirs changes get auto-committed" 1 "Provide .deb package" 1 "Better documentation/walkthroughs on using git-annex within an existing git repo. AKA mixed use" 1 "Union mounts to have a single view of file collection on the network" 1 "Ubuntu PPA does not build with webapp"]]
|
||||
|
||||
Feel free to write in your own reasons, or add a comment to give me more info.
|
||||
|
|
|
|||
31
doc/forum/Howto_remove_unused_files.mdwn
Normal file
31
doc/forum/Howto_remove_unused_files.mdwn
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
Hello.
|
||||
|
||||
My case: I have somehow managed to get my repo, with quite much stuff inside it messed up.
|
||||
|
||||
There is single directory 'cities' containing quite many files (>10k) that i would rather see gone (and keep the tar.bz version of it ..). I tried doing
|
||||
|
||||
git drop --force
|
||||
|
||||
that works fine, but the files are still there after sync.
|
||||
|
||||
git annex unused says just 'ok' so i guess it thinks they are still used somewhere. I tried to look where, but i ended up just doing git annex drop -f my_remote_here test_file_name for each of my remotes. This doesnt help.
|
||||
How can i get rid of these files? Doing git annex fsck shows that
|
||||
|
||||
|
||||
So, try to search what is the key:
|
||||
|
||||
% ls -lah cities/diskcache/config.cfg
|
||||
lrwxrwxrwx 1 XX XXX 190 Nov 29 05:52 cities/diskcache/config.cfg -> ../../../../.git/annex/objects/qm/M6/SHA256-s32--4f5ce34d1b0b8d854a315530b2fdcbfa9c3067636a2aa5433a04402db4151dce/SHA256-s32--4f5ce34d1b0b8d854a315530b2fdcbfa9c3067636a2aa5433a04402db4151dce
|
||||
sundberg@sundberg-MS-7680 ~/git-repository/ubuntu.iso/Archive/Maps
|
||||
% git log --stat --all -SSHA256-s32--4f5ce34d1b0b8d854a315530b2fdcbfa9c3067636a2aa5433a04402db4151dce/SHA256-s32--4f5ce34d1b0b8d854a315530b2fdcbfa9c3067636a2aa5433a04402db4151dce
|
||||
commit 51a57a023774ff80408210828f298f5c42a7e0be
|
||||
Author: XXXX
|
||||
Date: Sun Dec 9 13:42:40 2012 +0200
|
||||
git-annex automatic sync
|
||||
Archive/Maps/cities/diskcache/config.cfg | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
So how can i deduce what is the remote i should try to clean up ?
|
||||
|
||||
|
||||
Thanks!
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawkbv1oKTKhbBp0Ljh_WGU7BFSWWxBr7D3U"
|
||||
nickname="Pauli"
|
||||
subject="Just to add"
|
||||
date="2013-04-02T19:01:09Z"
|
||||
content="""
|
||||
|
||||
When i do 'git annex get .' on my usb-remote i get these kind of prints:
|
||||
|
||||
get Archive/Maps/cities/diskcache/voices/slovenian_f/slovenian_female/g5ext_000 (not available)
|
||||
No other repository is known to contain the file.
|
||||
failed
|
||||
|
||||
|
||||
No repository contains the file? Well why cannot i then get it removed from the listing ..
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawkbv1oKTKhbBp0Ljh_WGU7BFSWWxBr7D3U"
|
||||
nickname="Pauli"
|
||||
subject="comment 2"
|
||||
date="2013-04-02T19:10:18Z"
|
||||
content="""
|
||||
Just to continue my monolog: doing 'git rm -r cities' followed with git annex sync did the trick. Why didn't i find this anywhere ..
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
[[!comment format=mdwn
|
||||
username="Rasmus"
|
||||
ip="213.120.148.111"
|
||||
subject="comment 2"
|
||||
date="2013-04-01T23:23:55Z"
|
||||
content="""
|
||||
Joey,
|
||||
|
||||
Thanks for your useful tips and for providing this software. It seems incredibly powerful and useful. I made a copy of the folder which I messed up. I will try the tips and report back (I'm on the road right now).
|
||||
|
||||
The other day all the Haskell deps worked out and I managed to build git annex. Hopefully, this will give more reliable results as it seemed that some of my bugs were caused by the 32bit prebuild on 64bit. If I succeed in recreating my files I will try to recreate the error :)
|
||||
"""]]
|
||||
|
|
@ -6,6 +6,21 @@ Should be as simple as: `yum install git-annex`
|
|||
|
||||
----
|
||||
|
||||
To install the latest version of git-annex on Fedora 18 and later, you can use `cabal`:
|
||||
|
||||
<pre>
|
||||
# Install dependencies
|
||||
sudo yum install libxml2-devel gnutls-devel libgsasl-devel ghc cabal-install happy alex libidn-devel
|
||||
# Update the cabal list
|
||||
cabal update
|
||||
# Install c2hs, required by dependencies of git-annex, but not automatically installed
|
||||
cabal install --bindir=$HOME/bin c2hs
|
||||
# Install git-annex
|
||||
cabal install --bindir=$HOME/bin git-annex
|
||||
</pre>
|
||||
|
||||
----
|
||||
|
||||
Older version? Here's an installation recipe for Fedora 14 through 15.
|
||||
|
||||
<pre>
|
||||
|
|
@ -22,4 +37,3 @@ cabal install --bindir=$HOME/bin
|
|||
|
||||
Note: You can't just use `cabal install git-annex`, because Fedora does
|
||||
not yet ship ghc 7.4.
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawkaBh9VNJ-RZ26wJZ4BEhMN1IlPT-DK6JA"
|
||||
nickname="Alex"
|
||||
subject="printing keys first is the easiest workaround"
|
||||
date="2013-04-01T23:32:23Z"
|
||||
content="""
|
||||
Since the keys are sure to have nos paces in them, putting them first makes working with the output with tools like sort, uniq, and awk simpler.
|
||||
"""]]
|
||||
Loading…
Add table
Reference in a new issue