Joey Hess
3c002e4f5c
update
2012-12-19 14:31:53 -04:00
Joey Hess
433607c8a5
Merge branch 'master' of ssh://git-annex.branchable.com
2012-12-19 14:29:38 -04:00
Joey Hess
078497c769
improve pagespec
2012-12-19 14:28:45 -04:00
http://joeyh.name/
b40a67097d
Added a comment
2012-12-19 18:20:50 +00:00
Joey Hess
269abc328f
Merge branch 'master' of ssh://git-annex.branchable.com
2012-12-19 14:19:53 -04:00
Joey Hess
7da2e27293
Bugfix: Fixed bug parsing transfer info files
...
The newline after the filename was included in it.
This was generally benign -- mostly these filenames are just displayed,
and the newline didn't matter.
But in the assistant, it caused unexpected dropping of preferred
content.
A characteristic of this bug is that the drop was displayed like this:
drop some_file
ok
2012-12-19 14:17:01 -04:00
http://edheil.wordpress.com/
f76d94a8ea
Added a comment
2012-12-19 17:19:28 +00:00
Joey Hess
f3833dfe35
Merge branch 'master' of ssh://git-annex.branchable.com
2012-12-19 12:52:02 -04:00
Joey Hess
915cd7f676
comment
2012-12-19 12:50:24 -04:00
Joey Hess
62e15d824c
update
2012-12-19 12:47:23 -04:00
Joey Hess
93c430c2a4
comment
2012-12-19 12:46:35 -04:00
Joey Hess
97d670b0d5
normalise associated files
...
Sometimes ./file will be passed in, and sometimes file; need to treat these
the same.
2012-12-19 12:44:24 -04:00
spwhitton
f6b8b4e9a5
2012-12-19 15:21:14 +00:00
Joey Hess
acb285d324
blog for the day
2012-12-18 17:16:12 -04:00
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