Joey Hess
9fcfcab485
Merge branch 'master' of ssh://git-annex.branchable.com
2012-12-25 12:48:24 -04:00
Joey Hess
c3a35eb857
add a guard against using git annex add in direct mode repo
...
Currently, it deletes files when run in one, so until I get a chance to fix
it, block foot shooting.
2012-12-24 14:54:36 -04:00
Joey Hess
cc5140d295
assistant adding of modified files in direct mode
...
Works with inotify, but I think in kqueue we don't get events
existing files that get modified.
2012-12-24 14:42:19 -04:00
Joey Hess
95db595e91
make startup scan for deleted files work in direct mode
...
git add --update cannot be used, because it'll stage typechanged direct
mode files. Intead, use ls-files to find deleted files, and stage them
ourselves.
It seems that no commit was made before when the scan staged deleted files.
(Probably masked since if files were added, a commit happened then..)
Now that I'm doing the staging, I was also able to fix that bug.
2012-12-24 14:24:13 -04:00
Joey Hess
c6d2bbe402
assistant adding of files in direct mode
2012-12-24 13:37:29 -04:00
http://joeyh.name/
6c435adcde
Added a comment
2012-12-23 19:51:53 +00:00
http://joeyh.name/
87a35859c9
Added a comment
2012-12-23 19:29:27 +00:00
http://joeyh.name/
f0e3ce5edf
Added a comment
2012-12-23 19:26:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmBUR4O9mofxVbpb8JV9mEbVfIYv670uJo
57c4ac76c3
Added a comment
2012-12-23 17:40:14 +00:00
http://www.joachim-breitner.de/
d98784aab4
2012-12-22 22:06:45 +00:00
Steve
4b8ae4f9e8
added link to forum post
2012-12-22 16:57:35 +00:00
Steve
8b202a30d6
2012-12-22 16:55:37 +00:00
Steve
ea40b0002b
2012-12-22 16:39:14 +00:00
Joey Hess
da8fbb9e3e
adjust path for logs
2012-12-21 15:06:22 -04:00
Joey Hess
f878141286
moved my autobuild
2012-12-21 15:05:08 -04:00
Joey Hess
bd0d06be23
SHA*E backends: Exclude non-alphanumeric characters from extensions.
...
* SHA*E backends: Exclude non-alphanumeric characters from extensions.
* migrate: Remove leading \ in SHA* checksums, and non-alphanumerics
from extensions of SHA*E keys.
2012-12-20 17:16:55 -04:00
Joey Hess
e71f85645e
handle sha*sum's leading \ in checksum with certian unsual filenames
...
* Bugfix: Remove leading \ from checksums output by sha*sum commands,
when the filename contains \ or a newline. Closes : #696384
* fsck: Still accept checksums with a leading \ as valid, now that
above bug is fixed.
* migrate: Remove leading \ in checksums
2012-12-20 17:07:10 -04:00
Joey Hess
071adb0709
Merge branch 'master' of ssh://git-annex.branchable.com
2012-12-20 15:28:17 -04:00
spwhitton
5a8773da39
2012-12-20 15:54:46 +00:00
Joey Hess
1702409f00
check
2012-12-20 00:08:30 -04:00
Joey Hess
df90a2acd5
another quickcheck
2012-12-20 00:02:33 -04:00
Joey Hess
df1540787f
test
2012-12-19 23:44:08 -04:00
Joey Hess
a6bd0076d4
remove unused fields
2012-12-19 23:41:54 -04:00
Joey Hess
3ef0ac2fa5
refactor
2012-12-19 23:13:50 -04:00
Joey Hess
8491917d04
more quickcheck fun
...
and the code gets better..
2012-12-19 22:14:12 -04:00
http://edheil.wordpress.com/
c6891af3c5
Added a comment
2012-12-20 00:05:09 +00:00
Joey Hess
295c2552ea
blog for the day
2012-12-19 16:41:01 -04:00
Joey Hess
ddb0adb998
more quickcheck fun
2012-12-19 16:36:19 -04:00
Joey Hess
bf71d42681
quickcheck test for transfer info read/write code
...
Fixed a bug the quickcheck turned up.
2012-12-19 16:15:39 -04:00
Joey Hess
987db10116
move old comments away so as not to scare users
2012-12-19 14:40:16 -04:00
Joey Hess
e36c29d9b7
renamed; not assistant specific
2012-12-19 14:32:09 -04:00
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
