Joey Hess
142803a90d
comment
2016-01-11 12:29:54 -04:00
Joey Hess
0021ae4485
commet
2016-01-11 12:21:45 -04:00
Joey Hess
dbdce142d4
comment
2016-01-11 12:20:40 -04:00
pkitslaar
7cf6299888
Added a comment: Possible fix for rsync windows paths
2016-01-11 10:25:23 +00:00
git-annex.branchable.com@69b3f2da2837a3d9de8eab0b93771008294b7d69
4caaa15f76
Added a comment
2016-01-10 12:06:53 +00:00
pkitslaar
bc1751b109
removed
2016-01-10 07:50:56 +00:00
pkitslaar
c3f0907667
Added a comment: Same here
2016-01-10 07:50:14 +00:00
pkitslaar
9e199a28f5
Added a comment: Same here
2016-01-10 07:49:52 +00:00
wsha.code+ga@b38779424f41c5701bbe5937340be43ff1474b2d
bd1ce3ef0d
Added a comment
2016-01-10 03:08:24 +00:00
G.nius.ck@d885edcfde63422ee84e5ee501b7aa545e91298d
6bdbc06317
Added a comment: What do you mean by "git-annex" branch?
2016-01-09 16:04:30 +00:00
https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf574
e4e76c881a
Added a comment: Copy from .git/config
2016-01-09 06:44:59 +00:00
mark@6b90344cdab3158eacb94a3944460d138afc9bef
f285579729
Added a comment: Special remotes
2016-01-08 21:12:45 +00:00
Joey Hess
dc58825bed
link
2016-01-08 16:37:47 -04:00
Joey Hess
2f41bbebfb
Merge branch 'master' of ssh://git-annex.branchable.com
2016-01-08 16:35:15 -04:00
Joey Hess
8be45cbf0a
devblog
2016-01-08 16:32:22 -04:00
Joey Hess
55ad30d1d9
update
2016-01-08 16:30:31 -04:00
oliverconzen@8cff8c5ab3868de177f748566f90c79720f9cf4b
1b91c07834
Added a comment
2016-01-08 19:21:28 +00:00
Joey Hess
51bc32e21e
better fix for slash in view metadata
...
The homomorphs are back, just encoded such that it doesn't crash in LANG=C
However, I noticed a bug in the old escaping; [pseudoSlash] was escaped the
same as ['/','/']. Fixed by using '%' to escape pseudoSlash. Which requires
doubling '%' to escape it, but that's already done in the escaping of
worktree filenames in a view, so is probably ok.
2016-01-08 13:55:35 -04:00
Joey Hess
42619e2231
view: Avoid using cute unicode homomorphs for '/' and '\' and instead use ugly escaping, as the unicode method doesn't work on non-unicode supporting systems.
2016-01-08 12:45:32 -04:00
Joey Hess
6b963426a0
link to new tip about encryption
2016-01-08 11:48:53 -04:00
Alan
498bd6fb43
2016-01-08 12:53:20 +00:00
wsha.code+ga@b38779424f41c5701bbe5937340be43ff1474b2d
e94ef9bcb7
2016-01-08 07:38:01 +00:00
anntzer.lee@b6e099b6ef8ba8b53005ca7f0e473e825001129b
f0a54b40de
Added a comment
2016-01-08 07:35:21 +00:00
sameerds
5527ea62b8
Added a comment: bump!
2016-01-08 07:31:18 +00:00
wsha.code+ga@b38779424f41c5701bbe5937340be43ff1474b2d
f381b5f952
Added a comment
2016-01-08 06:56:02 +00:00
philippgodbersen@b5b6f1c85f129c3bbf300214eb690810f9c582b6
219b1fc3f9
2016-01-07 23:27:10 +00:00
Joey Hess
65b0358444
response
2016-01-07 18:22:51 -04:00
Joey Hess
2b781cbf7b
Merge branch 'master' of ssh://git-annex.branchable.com
2016-01-07 18:03:33 -04:00
Joey Hess
c96fb11a96
devblog
2016-01-07 18:03:06 -04:00
Joey Hess
722f56a99d
update
2016-01-07 15:47:19 -04:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
ab36e2908b
Added a comment
2016-01-07 06:19:30 +00:00
Joey Hess
5498576c79
Merge branch 'master' of ssh://git-annex.branchable.com
2016-01-06 16:54:04 -04:00
Joey Hess
d667a68b7e
test: Added --keep-failures option.
2016-01-06 13:44:12 -04:00
ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626
679ab35238
Added a comment
2016-01-06 17:00:38 +00:00
Joey Hess
b96cfdc094
whereis --json: Make url list be included in machine-parseable form.
2016-01-06 12:33:32 -04:00
Joey Hess
6a194e09ff
response
2016-01-06 11:52:16 -04:00
mark@6b90344cdab3158eacb94a3944460d138afc9bef
632b4c72d2
2016-01-05 22:44:15 +00:00
Joey Hess
70a4d41b9d
Merge branch 'master' of ssh://git-annex.branchable.com
2016-01-05 18:13:10 -04:00
Joey Hess
50d25c186d
update
2016-01-05 17:41:46 -04:00
mark@6b90344cdab3158eacb94a3944460d138afc9bef
bf2f942997
removed
2016-01-05 20:14:46 +00:00
felix.hagemann@b76e9ea0928cf33dacffc37ec3dbecf33171a8a5
09435ff50a
2016-01-05 19:56:28 +00:00
CandyAngel
14c5c24c40
Added a comment
2016-01-05 11:41:13 +00:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
d45344e5c4
2016-01-05 11:23:36 +00:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
10aecc58ab
Added a comment
2016-01-05 11:09:07 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
1d6d7a6e16
2016-01-05 02:20:14 +00:00
umeboshi
54c569ee2e
Added a comment
2016-01-04 21:26:05 +00:00
sameerds
34408b48ec
2016-01-03 17:39:29 +00:00
eigengrau
621b903321
Added a comment
2016-01-03 07:52:36 +00:00
umeboshi
e3105b95e2
Fix formatting (grrr)
2016-01-02 23:29:38 +00:00
umeboshi
f234306a8a
added ifarchive.org mirror.
2016-01-02 23:23:49 +00:00
umeboshi
d63194fc36
removed
2016-01-02 23:13:43 +00:00
umeboshi
ab0494206c
Added a comment
2016-01-02 23:13:15 +00:00
umeboshi
bc4ff0c71f
Added a comment
2016-01-02 23:09:53 +00:00
umeboshi
628325f45b
2016-01-02 22:45:54 +00:00
umeboshi
a06f3e5014
Added a comment
2016-01-02 21:02:51 +00:00
umeboshi
75a28aae43
2016-01-02 20:15:38 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
91ba1f0405
Added a comment
2016-01-02 01:57:45 +00:00
ColinW
bd1974e98d
2016-01-01 22:53:23 +00:00
ColinW
c823d6f7de
Added a comment: Re Comment 1
2016-01-01 22:39:14 +00:00
Joey Hess
c626822679
devblog
2016-01-01 17:50:48 -04:00
Joey Hess
ef474f0da7
fixed
2016-01-01 17:46:36 -04:00
Joey Hess
92823d8413
analysis
2016-01-01 17:17:57 -04:00
Joey Hess
6c03a091ec
response
2016-01-01 16:41:48 -04:00
Joey Hess
650f9ddd8b
response
2016-01-01 16:37:31 -04:00
Joey Hess
121659576b
info --json: Improve json for "backend usage", using a nested object with fields for each backend instead of the previous weird nested lists. This may break existing parsers of this json output, if there were any.
2016-01-01 16:33:05 -04:00
Joey Hess
67532c7b49
response
2016-01-01 16:07:38 -04:00
Joey Hess
b1373f0d15
update
2016-01-01 16:02:11 -04:00
Joey Hess
eb2bf9d768
response
2016-01-01 15:39:13 -04:00
Joey Hess
e10731c6ee
Merge branch 'master' of ssh://git-annex.branchable.com
2016-01-01 15:22:51 -04:00
Joey Hess
f36f24197a
scan for unlocked files on init/upgrade of v6 repo
2016-01-01 15:09:42 -04:00
Joey Hess
b03a24dc10
update
2016-01-01 14:26:09 -04:00
markus@c65ad4f0b6624673047e959218d058eb73e7ff15
6cb5cb039d
2016-01-01 13:41:17 +00:00
lars@20e4ed7efd4581b7e490713058bd5f94e43488a1
913fb77e5b
2015-12-30 21:27:32 +00:00
Joey Hess
4be2b57606
add test: conflict resolution (mixed locked and unlocked file)
2015-12-30 16:36:39 -04:00
Joey Hess
eff33d33f0
Merge branch 'master' of ssh://git-annex.branchable.com
2015-12-30 15:21:40 -04:00
Joey Hess
0b8bba8031
test suite 100% pass in v6, finally!
...
Set annex.largefiles when adding the conflicting non-annexed file,
otherwise it would be added as an annexed file.
2015-12-30 15:12:45 -04:00
divergentdave@5c17d06f6d67c6f157b76a4cc95ca764b7d2f899
1e4d6c29d8
Added a comment: SELinux
2015-12-30 03:40:02 +00:00
divergentdave@5c17d06f6d67c6f157b76a4cc95ca764b7d2f899
f0732a21ae
Added a comment: Logcat output -- SELinux
2015-12-30 03:01:56 +00:00
Joey Hess
f34c0b1319
devblog
2015-12-29 17:47:57 -04:00
Joey Hess
7fd9fa3d72
update
2015-12-29 17:47:49 -04:00
Joey Hess
6aa19b7184
Merge branch 'master' of ssh://git-annex.branchable.com
2015-12-29 17:40:49 -04:00
umeboshi
813262448c
Added a comment: Link to TH
2015-12-29 20:36:42 +00:00
Joey Hess
b6b34f4916
automatic conflict resolution for v6 unlocked files
...
Several tricky parts:
* When the conflict is just between the same key being locked and unlocked,
the unlocked version wins, and the file is not renamed in this case.
* Need to update associated file map when conflict resolution renames
an unlocked file.
* git merge runs the smudge filter on the conflicting file, and actually
overwrites the file with the same content it had before, and so
invalidates its inode cache. This makes it difficult to know when it's
safe to remove such files as conflict cruft, without going so far as to
compare their entire contents.
Dealt with this by preventing the smudge filter from populating the file
when a merge is run. However, that also prevents the smudge filter being
run for non-conflicting files, so eg moving a file won't put its new
content into place.
* Ideally, if a merge or a merge conflict resolution renames an unlocked
file, the file in the work tree can just be moved, rather than copying
the content to a new worktree file.
This is attempted to be done in merge conflict resolution, but
due to git merge's behavior of running smudge filters, what actually
seems to happen is the old worktree file with the content is deleted and
rewritten as a pointer file, so doesn't get reused.
So, this is probably not as efficient as it optimally could be.
If that becomes a problem, could look into running the merge in a separate
worktree and updating the real worktree more efficiently, similarly to the
direct mode merge. However, the direct mode merge had a lot of bugs, and
I'd rather not use that more error-prone method unless really needed.
2015-12-29 15:41:09 -04:00
ColinW
b54c8eb49a
2015-12-29 17:59:03 +00:00
joseph.rawson.works@85a210ab8c0e37a0b2d6bb235738b20e23e8878f
6972a80ec1
Added a comment: Replacing dashes with underscores
2015-12-28 22:39:49 +00:00
joseph.rawson.works@85a210ab8c0e37a0b2d6bb235738b20e23e8878f
09deb028b4
Added a comment: ssh keys, github, xmpp
2015-12-28 22:09:24 +00:00
david.wargert@3142e930e120f177dff9fd083ebc900263143dad
049a0bb9f5
removed
2015-12-27 22:50:45 +00:00
Joey Hess
7eed80b316
cleanup
2015-12-27 17:27:52 -04:00
Joey Hess
342259aa9d
devblog
2015-12-27 17:18:18 -04:00
Joey Hess
ad742c522c
Merge branch 'master' of ssh://git-annex.branchable.com
2015-12-27 17:12:14 -04:00
Joey Hess
a46158240b
doc improvements
2015-12-27 16:06:11 -04:00
Joey Hess
121f5d5b0c
annex.thin
...
Decided it's too scary to make v6 unlocked files have 1 copy by default,
but that should be available to those who need it. This is consistent with
git-annex not dropping unused content without --force, etc.
* Added annex.thin setting, which makes unlocked files in v6 repositories
be hard linked to their content, instead of a copy. This saves disk
space but means any modification of an unlocked file will lose the local
(and possibly only) copy of the old version.
* Enable annex.thin by default on upgrade from direct mode to v6, since
direct mode made the same tradeoff.
* fix: Adjusts unlocked files as configured by annex.thin.
2015-12-27 15:59:59 -04:00
a@b34f238966e58f7c2ea550cc4cab3005c0e33150
15de76b362
2015-12-27 09:15:43 +00:00
Joey Hess
bb6719678e
update walkthrough and add tip about using v6 unlocked files
...
The walkthrough should make sense now both for v5 and v6 repo users.
2015-12-26 16:47:23 -04:00
Joey Hess
51b69ef551
add copy of note.mdwn, since Makefile's ikiwiki invocation omits the basewiki
2015-12-26 16:40:11 -04:00
Joey Hess
025f284ac1
reorg
2015-12-26 15:15:02 -04:00
Joey Hess
fcb013044b
update
2015-12-26 15:13:05 -04:00
Joey Hess
0fe43d7f8e
update for v6 unlocked files
2015-12-26 14:59:06 -04:00
Joey Hess
f776ac0a11
add unlocked flag for git-annex-shell recvkey
...
The direct flag is also set when sending unlocked content, to support old
versions of git-annex-shell. At some point, the direct flag will be
removed, and only the unlocked flag will be used.
2015-12-26 13:59:27 -04:00
david.wargert@3142e930e120f177dff9fd083ebc900263143dad
a79c297d1b
2015-12-26 14:56:28 +00:00
