Joey Hess
37ce10098c
comment
2019-05-07 11:12:00 -04:00
Ilya_Shlyakhter
5638ae9688
Added a comment
2019-05-07 00:59:31 +00:00
Ilya_Shlyakhter
4d0ae18635
Added a comment
2019-05-06 22:38:43 +00:00
Ilya_Shlyakhter
54b0028b5b
Added a comment
2019-05-06 20:24:14 +00:00
Joey Hess
b03e65d260
Improved locking when multiple git-annex processes are writing to the .git/index file
2019-05-06 15:15:12 -04:00
Joey Hess
4bc99e4c21
add todo
2019-05-06 14:58:59 -04:00
Joey Hess
65a82e0d27
Merge branch 'master' of ssh://git-annex.branchable.com
2019-05-06 14:45:02 -04:00
Joey Hess
c31d0fe11b
re worktrees
2019-05-06 14:42:51 -04:00
Ilya_Shlyakhter
f0f0d6e61c
Added a comment
2019-05-06 18:39:07 +00:00
Joey Hess
4f11885c12
response
2019-05-06 14:01:56 -04:00
Joey Hess
4999e6dd25
Merge branch 'master' of ssh://git-annex.branchable.com
2019-05-06 13:57:39 -04:00
Joey Hess
bf7ecd6892
fix export subtree reversion
...
Fix reversion in last release that caused wrong tree to be written to
remote tracking branch after an export of a subtree.
The invariant "commitsha should have the treesha as its tree"
was not met due to a bug. Guarantee it's met by catting the commitsha
to find its actual tree. A little bit slower, but this is not run often.
2019-05-06 13:57:13 -04:00
Ilya_Shlyakhter
590acf2b0d
question about concurrent writing to the git-annex branch by multiple git-annex commands
2019-05-06 17:05:50 +00:00
Joey Hess
0533fde73c
reproduced
2019-05-06 12:43:26 -04:00
Joey Hess
1bae209470
Merge branch 'master' of ssh://git-annex.branchable.com
2019-05-06 12:42:49 -04:00
Joey Hess
c6a4779036
analysis
2019-05-06 12:39:35 -04:00
Joey Hess
6ad51d5627
comment
2019-05-06 12:29:53 -04:00
Joey Hess
7c874327aa
comment
2019-05-06 12:25:17 -04:00
Joey Hess
6845c1e020
comment
2019-05-06 12:16:19 -04:00
Joey Hess
7c6ada691b
comment
2019-05-06 12:07:08 -04:00
Joey Hess
b3eed0feac
comment
2019-05-06 12:04:25 -04:00
Joey Hess
1a0c3e864b
close
2019-05-06 12:02:10 -04:00
Joey Hess
bcbaf3a851
update
2019-05-06 10:51:54 -04:00
herbgroll@5a05f17cf9cd3d69057fee2991f630e5a60cd197
947503cc6d
2019-05-05 19:15:28 +00:00
Joey Hess
afd57e137b
tweak to fix man page indent
2019-05-04 11:45:55 -04:00
Joey Hess
fd57780d04
add news item for git-annex 7.20190503
2019-05-03 12:49:01 -04:00
Ilya_Shlyakhter
437fa438e3
Added a comment
2019-05-03 16:31:18 +00:00
Ilya_Shlyakhter
6535d0c1b2
Added a comment
2019-05-03 16:26:40 +00:00
Ilya_Shlyakhter
03a20b225a
Added a comment
2019-05-03 16:11:06 +00:00
Joey Hess
9cb795da5f
Merge branch 'master' of ssh://git-annex.branchable.com
2019-05-03 11:53:37 -04:00
Joey Hess
40c749387f
comment
2019-05-03 11:53:03 -04:00
Ilya_Shlyakhter
3d214c3499
Added a comment
2019-05-03 15:50:43 +00:00
Joey Hess
644bae6f66
Merge branch 'master' of ssh://git-annex.branchable.com
2019-05-03 11:38:22 -04:00
Joey Hess
8c4b1d6f1f
response; cleanup
2019-05-03 11:37:41 -04:00
Ilya_Shlyakhter
64bcaff016
added todo for speculate-can-get : extension of speculate-present
2019-05-03 15:34:41 +00:00
yarikoptic
627fe280b0
Added a comment: question about .gitattributes
2019-05-03 15:21:41 +00:00
Joey Hess
60bed2c186
remove
2019-05-03 11:06:35 -04:00
Ilya_Shlyakhter
a153a694f4
Added a comment
2019-05-02 16:04:06 +00:00
yarikoptic
3eeb5a732c
initial report
2019-05-01 22:03:53 +00:00
Joey Hess
63ed61ae3d
devblog
2019-05-01 14:46:42 -04:00
Joey Hess
700a3f2787
Merge branch 'master' into import-from-s3
2019-05-01 14:30:52 -04:00
Joey Hess
a405ae015d
remove simple fast-forward todo
...
I think the history looks nice enough without that special case.
2019-05-01 14:29:52 -04:00
Joey Hess
7264b9aa8c
tweak wording
2019-05-01 14:29:10 -04:00
Joey Hess
a32f31235a
reuse old imported commits
...
This avoids proliferation of different import commits for the same
trees, and makes the resulting git history nice.
2019-05-01 14:20:26 -04:00
Joey Hess
ed1f53702c
Merge branch 'master' of ssh://git-annex.branchable.com
2019-04-30 16:34:38 -04:00
Joey Hess
8f9457dec8
devblog
2019-04-30 16:33:48 -04:00
Joey Hess
83a420dd66
update todo
2019-04-30 16:31:46 -04:00
Joey Hess
1503b86a14
make import tree from remote generate a merge commit
...
This way no history is lost, neither what was exported to the remote,
or the history of changes that is imported from it. No complicated
correlation of two possibly very different histories is needed, just
record what we know and then git merge will do a good job.
Also, it notices when the remote tracking branch doesn't need to be updated,
and avoids doing anything, so noop remotes are super cheap.
The only catch here is that, since the commits generated for imports
from the remote don't have a stable date or author/committer, each
(non-noop) import generates different commits for the same imported
trees. So, when the imported remote tracking branch is merged into master
and then a change is imported again, there will be an extra series of
commits, which will get more and more expensive each time.
This seems to call for making stable commits for imports. Also that
seems a good idea to make importing in several repositories have the
same result.
2019-04-30 16:13:21 -04:00
Ilya_Shlyakhter
59922f1f45
Added a comment: format of log files on the git-annex branch
2019-04-30 17:52:41 +00:00
Joey Hess
3a6b9ccada
Merge branch 'master' of ssh://git-annex.branchable.com
2019-04-30 12:19:26 -04:00
Joey Hess
9dd764e6f7
Added mimeencoding= term to annex.largefiles expressions.
...
* Added mimeencoding= term to annex.largefiles expressions.
This is probably mostly useful to match non-text files with eg
"mimeencoding=binary"
* git-annex matchexpression: Added --mimeencoding option.
2019-04-30 12:17:22 -04:00
TroisSinges
857ad83ca4
2019-04-30 06:06:07 +00:00
yarikoptic
4f53cbbba8
Added a comment: update
2019-04-29 13:41:32 +00:00
Ilya_Shlyakhter
d8dbf53b57
Added a comment: use git-annex-untrust
2019-04-28 17:32:30 +00:00
Ilya_Shlyakhter
95b74b3fc1
removed
2019-04-28 17:29:59 +00:00
Ilya_Shlyakhter
8b8dbf1b70
Added a comment
2019-04-28 17:29:13 +00:00
stratosgear@54a818e85fb71bedb15c5ed52ba9442429f1698b
9a1484f4fb
2019-04-28 16:40:00 +00:00
yarikoptic
6b3cfcd59d
Added a comment: change in libmagic behavior
2019-04-26 15:20:22 +00:00
Joey Hess
ff475d71c0
analysis
2019-04-26 10:23:48 -04:00
Joey Hess
cd5e685fd1
comment
2019-04-26 10:18:55 -04:00
Joey Hess
3e85707ccf
Merge branch 'master' of ssh://git-annex.branchable.com
2019-04-26 10:17:15 -04:00
yarikoptic
28a3926c8c
initial report on twice the add line reported
2019-04-26 14:01:54 +00:00
yarikoptic
ec69ae87ed
initial report on strange text file addition to annex instead of git
2019-04-26 13:58:30 +00:00
yarikoptic
b71a1b5483
wishlist for add --json-progress
2019-04-25 16:33:19 +00:00
Joey Hess
6af70dc5f8
Merge branch 'master' of ssh://git-annex.branchable.com
2019-04-25 10:54:18 -04:00
Joey Hess
2a6824bf9d
close
2019-04-25 10:49:55 -04:00
TroisSinges
e3de7ba02a
2019-04-25 11:57:58 +00:00
Joey Hess
fcf6a8851e
Merge branch 'master' of ssh://git-annex.branchable.com
2019-04-24 18:37:22 -04:00
Joey Hess
5b0e5922f5
devblog
2019-04-24 18:37:04 -04:00
Joey Hess
ca385a09c1
rename problem
2019-04-24 15:52:05 -04:00
Joey Hess
a71ae8053e
Merge branch 'master' into import-from-s3
2019-04-24 15:22:25 -04:00
Joey Hess
5b09b016fe
update
2019-04-24 15:22:02 -04:00
Ilya_Shlyakhter
ae04ab3b91
re: backend variants that compute checksum of chunk checksums
2019-04-24 17:40:13 +00:00
Ilya_Shlyakhter
d9fcc9c6cc
added a hyperlink from key internals page to git-annex-examinekey
2019-04-24 17:18:33 +00:00
avar
8876e6a4de
Added a comment: A useful command in combination with this
2019-04-24 12:37:36 +00:00
Joey Hess
b4230bd023
devblog
2019-04-23 16:36:50 -04:00
Joey Hess
2d0dd34916
initial work toward correctly merging deeper import histories
...
Pure code is tested working, including with even histories that merge
several lines of development. Needs to be hooked up to git histories
next.
2019-04-23 16:34:19 -04:00
Joey Hess
48d30d8753
Merge branch 'master' into import-from-s3
2019-04-23 15:34:26 -04:00
Joey Hess
c3f5e7863c
some more todos
2019-04-23 15:34:11 -04:00
Joey Hess
8d01b00507
update status
2019-04-23 14:50:33 -04:00
Joey Hess
cab28b48af
reorder
2019-04-23 14:45:34 -04:00
Joey Hess
a42e7a012a
refuse unsafe store to unversioned exporttree with old aws version
...
I've developed a patch to aws, once it gets merged, the real version
number of aws can be filled in.
2019-04-23 14:39:30 -04:00
Joey Hess
ae21c88640
tested S3 import/export with versioned bucket
...
rename and delete working
2019-04-23 13:43:41 -04:00
Joey Hess
0c878899ea
update status
2019-04-23 13:21:38 -04:00
Joey Hess
67d6280242
document importree for S3
2019-04-23 13:19:08 -04:00
Joey Hess
22fbab0563
close
2019-04-23 12:42:13 -04:00
Ilya_Shlyakhter
4c79f2b4ac
added suggestion to use git-replace for better implement git-annex-migrate
2019-04-22 01:26:55 +00:00
richih@c163df26fe804f6b596ffbfefe3691879d60c12d
2deb3e9129
2019-04-21 20:27:02 +00:00
guillaume.charbonnier@b98fd014ecb3f24159afc522ada81365a562f4fc
b851c12972
2019-04-21 20:09:20 +00:00
guillaume.charbonnier@b98fd014ecb3f24159afc522ada81365a562f4fc
c1f5e5a9f1
2019-04-21 16:39:13 +00:00
guillaume.charbonnier@b98fd014ecb3f24159afc522ada81365a562f4fc
2e31977789
2019-04-20 23:10:26 +00:00
guillaume.charbonnier@b98fd014ecb3f24159afc522ada81365a562f4fc
b23e3a83b1
2019-04-20 23:06:15 +00:00
Joey Hess
6f846f4c38
Merge branch 'master' of ssh://git-annex.branchable.com
2019-04-19 15:21:34 -04:00
Joey Hess
a7ba22ffd3
devblog
2019-04-19 15:20:55 -04:00
Joey Hess
2f79cb4b45
versioned import from S3 is working
...
Still some bugs and two stubbed methods to implement though.
2019-04-19 15:13:49 -04:00
Joey Hess
55a5d9679a
implemented mkImportableContentsVersioned
2019-04-19 13:39:33 -04:00
yarikoptic
2c61fbf858
Added a comment: indeed a useful use case
2019-04-19 13:26:05 +00:00
Joey Hess
af332f8b36
Merge branch 'master' of ssh://git-annex.branchable.com
2019-04-18 16:38:37 -04:00
Joey Hess
e65455fdda
devblog
2019-04-18 16:38:15 -04:00
Joey Hess
1968f6d9c6
designing S3 GetBucketObjectVersions to ImportableContents algo
...
I think I have a good algo now, at least poorly explained in English..
2019-04-18 16:25:04 -04:00
