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
4a8f02e939
don't empty historyCommitParents
2019-05-01 13:38:40 -04:00
Joey Hess
2bd0e07ed8
make merge commit on export that preserves the import history
2019-05-01 13:13:00 -04:00
Joey Hess
d1c283b691
comments
2019-05-01 12:37:54 -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
Joey Hess
b69d11ec42
wip
2019-04-30 14:00:27 -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
28b4310abe
typo
2019-04-30 12:22:13 -04: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
Joey Hess
5d55f968cc
Merge branch 'master' of ssh://git-annex.branchable.com
2019-04-28 09:53:40 -04:00
Joey Hess
dd31805108
not a phantom type
2019-04-27 16:18:27 -04: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
Joey Hess
18cf21d3ed
wip
2019-04-26 10:17:02 -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
Joey Hess
f08cd6a4ac
set S3 version id in retrieveExportWithContentIdentifierS3
...
This is necessary because of checks for a S3 version id being set
done when deleting the export or overwriting or renaming it.
2019-04-24 15:13:07 -04:00
Joey Hess
b9b3567747
added Git.History
2019-04-24 14:55:49 -04:00
Joey Hess
c8f7cb8558
fix incorrect comment
...
The process will typically block until all input is read.
2019-04-24 14:29:46 -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
