Joey Hess
3e91cd13ba
Fix data loss that can occur when annex.pidlock is set in a repository.
2016-03-01 12:12:57 -04:00
Joey Hess
2f48c0aa7c
comment
2016-03-01 11:42:40 -04:00
Joey Hess
a7df5c6867
comment
2016-03-01 11:39:34 -04:00
Joey Hess
802f0f7c8a
reopen
2016-03-01 10:48:00 -04:00
Joey Hess
439bc31b0f
comment
2016-03-01 10:36:52 -04:00
bvaa
f6e1770426
Added a comment: similar problem
2016-03-01 08:12:27 +00:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
1f2e7fea6a
Added a comment
2016-03-01 07:10:56 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
5f0c8efb9a
initial whining
2016-03-01 00:33:44 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
36224d99fd
2016-03-01 00:04:51 +00:00
Joey Hess
eb4faba81a
Merge branch 'master' of ssh://git-annex.branchable.com
2016-02-29 17:40:24 -04:00
Joey Hess
c23b82dc27
devblog
2016-02-29 17:39:38 -04:00
Joey Hess
102229fc67
need to update master
2016-02-29 17:39:06 -04:00
Joey Hess
a97a9aaaee
remove debug
2016-02-29 17:36:20 -04:00
Joey Hess
70e65db751
note a bug
2016-02-29 17:30:37 -04:00
Joey Hess
70e78cc53e
update keys database when adjusting branches
2016-02-29 17:27:19 -04:00
Joey Hess
d7bd4d971d
implement updateAdjustedBranch
2016-02-29 17:16:56 -04:00
Joey Hess
9e6839fd3f
fix bug introduced in recent commit
2016-02-29 17:12:55 -04:00
Joey Hess
9731514c75
update sync branch to the orig branch when in adjusted branch
2016-02-29 16:57:42 -04:00
Joey Hess
048d513233
make assistant aware of adjusted branches when merging
2016-02-29 15:57:47 -04:00
Joey Hess
c1d7a5b97c
push original branch when on adjusted branch
2016-02-29 15:29:56 -04:00
Joey Hess
7c20bf6e7a
make sync aware of adjusted branches
...
So, it will pull and push the original branch, not the adjusted one.
And, for merging, it will use updateAdjustedBranch (not implemented yet).
Note that remaining uses of Git.Branch.current need to be checked too;
for things that should act on the original branch, and not the adjusted
branch.
2016-02-29 15:23:08 -04:00
michael.hanke@c60e12358aa3fc6060531bdead1f530ac4d582ec
36840ff2d7
2016-02-29 19:18:32 +00:00
Joey Hess
9e1ebc2336
include adjustment in the adjusted branch name
...
Allows it to be recovered easily.
2016-02-29 15:04:58 -04:00
Joey Hess
3b4557c754
Merge branch 'master' into adjustedbranch
2016-02-29 14:05:10 -04:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
ce9e00f8dc
Added a comment
2016-02-29 17:25:17 +00:00
Joey Hess
e520366c4d
metadata: Added -r to remove all current values of a field.
2016-02-29 13:00:46 -04:00
Joey Hess
98fcc23e4f
use DelMeta to unset tag
...
No behavior change, just simplification.
2016-02-29 13:00:23 -04:00
Joey Hess
4763004632
add news item for git-annex 6.20160229
2016-02-29 12:56:56 -04:00
Joey Hess
c4494f1abe
leap year release
2016-02-29 12:41:59 -04:00
Joey Hess
5c23b8b49a
forgot to add this comment earlier
2016-02-29 12:41:39 -04:00
Joey Hess
37a89cca43
comment
2016-02-29 11:52:20 -04:00
Joey Hess
be4820ce32
Merge branch 'master' of ssh://git-annex.branchable.com
2016-02-29 11:43:29 -04:00
Joey Hess
955ab3a973
fix android build
2016-02-29 11:43:22 -04:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
2d5039fff6
2016-02-29 06:22:05 +00:00
Joey Hess
36ba39c4f3
remove lower-casing of field names; metadata fields are case-insensative
2016-02-28 11:56:55 -04:00
Joey Hess
79a7bed2d7
Merge branch 'master' of ssh://git-annex.branchable.com
2016-02-28 11:11:43 -04:00
Joey Hess
764e57f1f1
The pre-commit-annex hook script that automatically extracts metadata has been updated to also use exiftool. Thanks, Klaus Ethgen.
2016-02-28 11:10:55 -04:00
page
e164d530f9
Added a comment: Some additional notes
2016-02-28 11:44:39 +00:00
Joey Hess
b946ca44c3
Support --metadata field<number, --metadata field>number etc to match ranges of numeric values.
...
Similarly (well, for free), support preferred content expressions like
metadata=field<number and metadata=field>number
2016-02-27 10:55:02 -04:00
Joey Hess
01f1de0c3c
close bug and changelog
...
finished testing recent commits, and I did solve it
2016-02-26 16:51:28 -04:00
Joey Hess
ac8af8da07
better forcing of hash
2016-02-26 16:36:24 -04:00
Joey Hess
facc50d965
forgot to use sfile
2016-02-26 16:12:40 -04:00
Joey Hess
e3a73e5bb7
try again at forcing file read while hashing
2016-02-26 14:04:10 -04:00
Joey Hess
41fd029c9b
update
2016-02-26 13:54:58 -04:00
Joey Hess
66f2b3d4e0
bug
2016-02-26 13:49:26 -04:00
Joey Hess
fe44eb95e2
close
2016-02-26 13:36:17 -04:00
Joey Hess
d1f87e8c8e
test revert "force hash to finish with file before returning"
...
This reverts commit 7482853ddd
2016-02-26 13:30:38 -04:00
Joey Hess
3a6039c287
typo
2016-02-26 12:21:20 -04:00
Joey Hess
471a211d21
Include magic database in the linux and OSX standalone builds.
2016-02-26 11:54:15 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
5d0b5eeefb
2016-02-26 04:04:40 +00:00
