Joey Hess
c3e0859846
Upgrading a direct mode repository to v6 has changed to enter an adjusted unlocked branch.
...
This makes the direct mode to v6 upgrade able to be performed in one clone
of a repository without affecting other clones, which can continue using v5
and direct mode.
2016-04-04 13:17:24 -04:00
Joey Hess
c7b06b879b
Merge branch 'master' of ssh://git-annex.branchable.com
2016-04-02 16:48:03 -04:00
zarel
0522afa067
Added a comment
2016-04-02 20:22:23 +00:00
zarel
2f420e3ca9
2016-04-02 20:16:47 +00:00
tim@5431dd39464df207b7d46d3cf1bc74c82123ac68
083dd8f64e
Typo
2016-04-01 21:38:42 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
6509834f3d
Added a comment: cache?
2016-04-01 19:56:44 +00:00
https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec
ce63557e23
2016-04-01 17:05:04 +00:00
https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec
e793a32082
2016-04-01 17:04:21 +00:00
https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec
d1621c89cc
2016-04-01 17:02:44 +00:00
Joey Hess
3125b4298b
better example
2016-04-01 10:58:21 -04:00
Joey Hess
11d76f0c8e
Merge branch 'master' of ssh://git-annex.branchable.com
2016-03-31 19:07:03 -04:00
Joey Hess
92db17e16f
devblog
2016-03-31 19:06:30 -04:00
Joey Hess
ed3e8e1886
Merge branch 'adjustedbranch'
2016-03-31 19:05:47 -04:00
Joey Hess
b7d7cc858e
remove old bug
...
I just fixed this one today; it was not the problem I thought it was.
2016-03-31 18:56:30 -04:00
Joey Hess
12ddb6e8b2
fixed merging of changes from adjusted branch + a remote
2016-03-31 18:54:35 -04:00
Kalle
78ce8fc01c
Added a comment: Had what I believe to be the same issue
2016-03-31 21:22:22 +00:00
Joey Hess
f08149207c
autoinit on upgrade
2016-03-31 17:20:43 -04:00
Joey Hess
11935c4d6f
fix parsing of commit with no parents
2016-03-31 17:12:01 -04:00
Joey Hess
860602a1e6
made some progress on syncing adjusted branches, but still buggy
2016-03-31 14:56:10 -04:00
Don
2f239a3705
Added a comment: want everything, but not old versions
2016-03-31 18:50:56 +00:00
Joey Hess
a585731935
add reflog messages
2016-03-31 12:27:48 -04:00
Joey Hess
02ce75c87d
clean up handling of commit lock
...
Closing the lock manually caused a later exception when the bracket tried
to close it again.
2016-03-31 12:04:05 -04:00
Antoine Beaupré
c82d6ba99e
explain a bit more
2016-03-31 10:55:20 -04:00
Antoine Beaupré
2819bab344
new script
2016-03-31 10:50:37 -04:00
anarcat
02cdd59bb6
another batch?
2016-03-31 14:08:03 +00:00
Joey Hess
93f5ccc808
update
2016-03-30 16:01:59 -04:00
Joey Hess
20c942108c
Merge branch 'master' of ssh://git-annex.branchable.com
2016-03-30 15:55:23 -04:00
Joey Hess
d72b85d437
update
2016-03-30 15:55:18 -04:00
anarcat
749e1041b3
workaround
2016-03-30 18:19:17 +00:00
anarcat
625d4bb8f1
more details
2016-03-30 18:11:30 +00:00
anarcat
7935355b7e
weird info bug
2016-03-30 18:02:25 +00:00
anarcat
e250bd801b
formatting fix
2016-03-30 03:22:00 +00:00
anarcat
9b7ea9aaf6
usability issue with crippled filesystems? not sure how to handle this
2016-03-30 03:21:00 +00:00
Joey Hess
f63b839763
todo
2016-03-29 18:03:02 -04:00
Joey Hess
7afc82cf1d
devblog
2016-03-29 16:47:21 -04:00
Joey Hess
4b4a3b0152
todo
2016-03-29 16:44:09 -04:00
Joey Hess
fb656b9048
log --raw-date: Use to display seconds from unix epoch.
2016-03-29 14:39:16 -04:00
Joey Hess
1d848a45d2
log: Display time with time zone.
...
Also cleaned up ugliness with zombies.
2016-03-29 14:27:49 -04:00
Joey Hess
6301543c00
prevent git-annex adjust changing things out from under the daemon
2016-03-29 13:57:48 -04:00
Joey Hess
8a69298bf2
init: Automatically enter the adjusted unlocked branch when in a v6 repo on a filesystem not supporting symlinks.
2016-03-29 13:54:42 -04:00
Joey Hess
bcd2350fc7
update
2016-03-29 13:30:29 -04:00
Joey Hess
42b7ccc89f
git annex add in adjusted unlocked branch
...
Cached the current branch lookup just because it seems unnecessary overhead
to run an extra git command per add to query the current branch.
2016-03-29 13:26:06 -04:00
Joey Hess
4226ae1040
updae
2016-03-29 12:50:25 -04:00
Joey Hess
5e1d7bbc00
limit git annex adjust to v6 mode
...
doesn't work in v5
2016-03-29 12:05:02 -04:00
Joey Hess
f4dd3fbb68
option parser for adjust command
2016-03-29 11:54:18 -04:00
Joey Hess
4c9ca98769
docs for git-annex adjust
2016-03-29 11:39:43 -04:00
Joey Hess
1df62b43d1
remove hashPointerFile'
...
no longer needed now that hashPointerFile uses a long-running git
hash-object handle
2016-03-29 11:15:21 -04:00
Joey Hess
70e8d6860e
Merge branch 'master' into adjustedbranch
2016-03-29 11:07:40 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
2fd7cc4bfe
2016-03-29 13:27:39 +00:00
Joey Hess
2ba851ff5d
OSX build updated for security fix; old obsolete builds for older versions removed as they contain vulnerable git
2016-03-28 12:51:16 -04:00
