mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
27277 commits 13 branches 455 tags 157 MiB
Commit graph

2646 commits

Author SHA1 Message Date
Joey Hess
57fddd5cd2 blog for the day 2012-12-25 16:18:51 -04:00
Joey Hess
8a8380f1b7 use sync command merge engine in assistant 
To handle direct mode merging.
 2012-12-25 14:10:07 -04:00
Joey Hess
295c2552ea blog for the day 2012-12-19 16:41:01 -04:00
Joey Hess
62e15d824c update 2012-12-19 12:47:23 -04:00
Joey Hess
acb285d324 blog for the day 2012-12-18 17:16:12 -04:00
Joey Hess
0abf4b3c0a update 2012-12-18 15:07:35 -04:00
Joey Hess
d62a58b9c8 Merge branch 'master' into desymlink 2012-12-18 12:36:29 -04:00
Joey Hess
a7fe423966 blog for the day 2012-12-17 19:14:47 -04:00
Joey Hess
40fa6936e4 Merge branch 'master' into desymlink 
Conflicts:
	debian/changelog
	doc/design/assistant/desymlink.mdwn
 2012-12-17 13:29:10 -04:00
http://joeyh.name/
a376b01c0d Added a comment 2012-12-17 16:16:47 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmYiJgOvC4IDYkr2KIjMlfVD9r_1Sij_jY
38221c8a27 Added a comment: OSX troubles 2012-12-17 16:07:42 +00:00
Joey Hess
ab046b302b removing archive pages, which broke the blog and I don't want 2012-12-16 15:13:53 -04:00
admin
b14bb65d8c calendar update 2012-12-15 07:01:07 +00:00
Joey Hess
dd183e33ab blog for the day 2012-12-14 16:57:58 -04:00
Joey Hess
d7c582074e typo 2012-12-14 15:01:29 -04:00
Joey Hess
0e2a42d055 Merge branch 'master' of ssh://git-annex.branchable.com 2012-12-14 14:40:45 -04:00
Joey Hess
7a706dfa8d add calendar sidebar 2012-12-14 14:37:15 -04:00
http://edward.myopenid.com/
642a689941 escape ^ 2012-12-14 08:45:05 +00:00
Joey Hess
b569f07ff0 blog for the day 2012-12-13 16:09:47 -04:00
Joey Hess
64993f64bf update 2012-12-13 16:09:25 -04:00
Joey Hess
f807e60d9b todo: support pairing with multiple distinct repos 2012-12-13 12:34:39 -04:00
Joey Hess
b080a58b76 Merge branch 'master' into desymlink 
Conflicts:
	Annex/CatFile.hs
	Annex/Content.hs
	Git/LsFiles.hs
	Git/LsTree.hs
 2012-12-13 00:29:06 -04:00
http://joeyh.name/
fa9cead9dd Added a comment 2012-12-12 23:45:42 +00:00
Joey Hess
5d6b0bb086 blog for the day 2012-12-12 19:38:53 -04:00
Joey Hess
d4bd8fdd63 update 2012-12-12 19:31:31 -04:00
http://lj.rossia.org/users/imz/
3ff783b207 Added a comment: "removing" vs drop 2012-12-12 13:20:42 +00:00
Joey Hess
26ed352fc5 update 2012-12-10 16:11:38 -04:00
Joey Hess
4aa6d6bf3b blog for the day 2012-12-10 15:50:41 -04:00
Joey Hess
eccfc69f04 Merge branch 'master' into desymlink 2012-12-10 14:47:30 -04:00
Joey Hess
3539105637 update list of things TODO to make git annex sync work in direct mode 2012-12-10 14:47:11 -04:00
Joey Hess
6dfb1cd9a0 Merge branch 'master' into desymlink 2012-12-10 12:20:33 -04:00
Joey Hess
42bb811c5b blog for the day 2012-12-08 17:49:02 -04:00
Joey Hess
81b19b18de update 2012-12-08 17:05:05 -04:00
Joey Hess
78498719a0 Merge branch 'master' into desymlink 2012-12-08 13:00:58 -04:00
Joey Hess
2ed8a6e215 blog for the day 2012-12-07 17:49:31 -04:00
Joey Hess
ef24751922 support for checking presence of objects in direct mode 
Also for dropping objects in direct mode.

Checking presence reliably needs a cache of mtime, size, and inode.
This way, if a file is modified, keys that point to it are no longer
present.

Also, the code for restoring the symlink when removing objects is
unnecessarily messy. calcGitLink was generating links starting with
"../../remote/.git/", when running "git annex move --from remote".
I put in a workaround, but calcGitLink should probably be fixed.

There is not yet support for getting objects from repositories in direct
mode; it still looks for content in .git/annex/objects, and there's no
once place I can change to fix that.

Also, getting objects from direct mode repositories is problematic since
the can be changed while the object is being transferred. It probably needs
to quarantine it first.
 2012-12-07 17:29:55 -04:00
2001:660:7304:c::157
6176c052a1 poll vote (My phone (or MP3 player)) 2012-12-07 12:59:53 +00:00
Joey Hess
3c6fd42209 blog for the day 2012-12-06 17:16:33 -04:00
hamish
d9d1288e04 2012-12-06 03:33:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5vDem1yeIu6uith5pxfb4mdKdIWVJpCs
08743bc828 removed 2012-12-05 03:29:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5vDem1yeIu6uith5pxfb4mdKdIWVJpCs
a93cd09147 removed 2012-12-05 03:28:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5vDem1yeIu6uith5pxfb4mdKdIWVJpCs
b38f37fa3a Added a comment: AWS regions in JSON 2012-12-05 03:28:31 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5vDem1yeIu6uith5pxfb4mdKdIWVJpCs
c4f2f81fea Added a comment: AWS regions in JSON 2012-12-05 03:28:02 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5vDem1yeIu6uith5pxfb4mdKdIWVJpCs
79c944efaf Added a comment: AWS regions in JSON 2012-12-05 03:27:53 +00:00
Joey Hess
55d15fa658 blog for the day 2012-12-04 17:53:01 -04:00
Joey Hess
c2ca017c15 close poll 2012-12-04 17:52:31 -04:00
Joey Hess
fca19fe58b worked out more design 2012-12-04 17:52:23 -04:00
http://1id.com/contact/=tp
00e448c92f Added a comment: In case it might be helpful 2012-12-04 14:25:14 +00:00
212.36.36.212
da58921502 poll vote (solve the symlink problem first) 2012-12-04 14:07:44 +00:00
134.100.108.189
823e07e289 poll vote (solve the symlink problem first) 2012-12-04 13:03:41 +00:00