mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
8054 commits 13 branches 442 tags 103 MiB
Commit graph

8054 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joey Hess
05ec4587dd partial and incomplete automatic merging in direct mode 
Handles our file right, but not theirs.
 2012-12-18 17:15:16 -04:00
Joey Hess
92bd889e61 unused 2012-12-18 17:15:11 -04:00
Joey Hess
0abf4b3c0a update 2012-12-18 15:07:35 -04:00
Joey Hess
53dbcce645 direct mode merging works! 
Automatic merge resoltion code needs to be fixed to preserve objects from
direct mode files.
 2012-12-18 15:04:44 -04:00
Joey Hess
d62a58b9c8 Merge branch 'master' into desymlink 2012-12-18 12:36:29 -04:00
Joey Hess
77931c1e92 vicfg: Quote filename. Closes: #696193 2012-12-18 12:19:24 -04:00
Joey Hess
0846d60c3c new autobuilder 2012-12-17 19:47:39 -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
Joey Hess
d8c6376202 close fixed OSX issues 2012-12-17 13:03:49 -04:00
Joey Hess
00fd541304 OSX Mountian Lion builds now available 2012-12-17 12:59:18 -04:00
Joey Hess
c480c07a14 Merge branch 'master' of ssh://git-annex.branchable.com 2012-12-17 12:43:34 -04:00
Joey Hess
0a086dc7a5 move tip from forum to tips 2012-12-17 12:43:08 -04:00
http://joeyh.name/
4e62588de2 Added a comment 2012-12-17 16:32:31 +00:00
Joey Hess
c01fbbacce Merge branch 'master' of ssh://git-annex.branchable.com 2012-12-17 12:26:16 -04:00
http://joeyh.name/
bde784a5af Added a comment 2012-12-17 16:23:06 +00:00
http://joeyh.name/
52f60eb00d Added a comment 2012-12-17 16:21:37 +00:00
Joey Hess
bcd0c227e6 back to $SHELL for OSX app 
This is safe because we no longer mess with LD_PRELOAD equivilants.
Since the linux standalone bundle still does, it continues to run sh.
 2012-12-17 12:20:44 -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
https://www.google.com/accounts/o8/id?id=AItOawkfHTPsiAcHEEN7Xl7WxiZmYq-vX7azxFY
6d84e23a41 2012-12-17 14:53:37 +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
https://www.google.com/accounts/o8/id?id=AItOawkfHTPsiAcHEEN7Xl7WxiZmYq-vX7azxFY
cd93fd0e1a Added a comment 2012-12-16 05:27:06 +00:00
andy
7ba87e5ee9 Added a comment: Thanks! 2012-12-16 00:31:10 +00:00
http://edheil.wordpress.com/
b099179e20 Added a comment 2012-12-16 00:11:38 +00:00
http://edheil.wordpress.com/
5817e834e1 Added a comment 2012-12-16 00:10:39 +00:00
andy
4cc75d85d6 2012-12-15 22:32:52 +00:00
Steve
2f9ac6a369 2012-12-15 14:06:24 +00:00
admin
b14bb65d8c calendar update 2012-12-15 07:01:07 +00:00
http://edheil.wordpress.com/
7f417898be Added a comment 2012-12-15 05:47:25 +00:00
Joey Hess
2bfaa8a647 move away 2 old comments that I think are now addressed in the install instructions 2012-12-14 22:27:22 -04:00
Sergei Trofimovich
1c47956bcf cabal: add missing depend to 'test-suite', guard against 'kqueue' on linux 
Fixes the following test failure:

Preprocessing test suite 'test' for git-annex-3.20121211...

Remote/Git.hs:42:8:
    Could not find module `Control.Concurrent.MSampleVar'
    It is a member of the hidden package `SafeSemaphore-0.9.0'.
    Perhaps you need to add `SafeSemaphore' to the build-depends in your .cabal file.
    Use -v to see a list of the files searched for.

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
 2012-12-14 16:58:52 -04:00
Joey Hess
d59261a650 Merge branch 'master' of ssh://git-annex.branchable.com 2012-12-14 16:58:22 -04:00
Joey Hess
dd183e33ab blog for the day 2012-12-14 16:57:58 -04:00
http://joeyh.name/
5e96639d51 Added a comment 2012-12-14 20:55:12 +00:00
Joey Hess
3b54c1d3e4 kqueue: Fix bug that made broken symlinks not be noticed. 2012-12-14 16:28:27 -04:00
Joey Hess
82617b92e9 move thirdparty program installation for standalone bundle into haskell program 
This allows it to use Build.SysConfig to always install the programs
configure detected. Amoung other fixes, this ensures the right uuid
generator and checksum programs are installed.

I also cleaned up the handling of lsof's path; configure now checks for
it in PATH, but falls back to looking for it in sbin directories.
 2012-12-14 16:07:59 -04:00
Joey Hess
1a10f109c1 quiet shell error message 2012-12-14 15:05:08 -04:00
Joey Hess
1b21e915dd Merge branch 'master' of ssh://git-annex.branchable.com 2012-12-14 15:02:01 -04:00
Joey Hess
d7c582074e typo 2012-12-14 15:01:29 -04:00
http://joeyh.name/
1111dfbb00 Added a comment 2012-12-14 18:53:04 +00: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
https://www.google.com/accounts/o8/id?id=AItOawkZktNHFhxC1kYA9KKdKpYJO4clq9WDsjE
b0bbd5d14b 2012-12-14 17:57:41 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkfHTPsiAcHEEN7Xl7WxiZmYq-vX7azxFY
a2dbf61219 Added a comment: OS/X daily 2012-12-13 2012-12-14 09:22:42 +00:00
http://edward.myopenid.com/
642a689941 escape ^ 2012-12-14 08:45:05 +00:00
http://joeyh.name/
df56a578da Added a comment 2012-12-13 22:40:59 +00:00
http://edheil.wordpress.com/
dee0f86bfa Added a comment 2012-12-13 20:50:18 +00:00
http://edheil.wordpress.com/
8aaccde72e 2012-12-13 20:49:26 +00:00
http://edheil.wordpress.com/
d7fa508c20 Added a comment 2012-12-13 20:39:58 +00:00