mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4205 commits 13 branches 442 tags 103 MiB
Commit graph

4205 commits

This branch
This branch
All branches
Author SHA1 Message Date
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
6b84f23317 Added a comment 2012-06-29 12:02:49 +00:00
Joey Hess
cd0ab91c91 blog for the day 2012-06-28 18:23:48 -04:00
Joey Hess
6cc3eb97db update 2012-06-28 14:06:22 -04:00
Joey Hess
343ecf999a post my current set of ideas for handling unlocking 2012-06-28 14:00:25 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
e4596a133e Added a comment 2012-06-28 13:39:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmURXBzaYE1gmVc-X9eLAyDat_6rHPl670
b2327f04c6 2012-06-28 12:37:29 +00:00
Joey Hess
1f09ae686e update 2012-06-27 21:11:39 -04:00
Joey Hess
2d7ebc0582 typo 2012-06-27 18:08:52 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
c6d595674b 2012-06-27 20:56:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
4e4c2498b8 2012-06-27 20:51:19 +00:00
Joey Hess
70329dc980 typo 2012-06-27 16:19:23 -04:00
Joey Hess
e365b8300d blog for the day 2012-06-27 16:14:50 -04:00
Joey Hess
6677a99cb4 Merge branch 'master' of ssh://git-annex.branchable.com 2012-06-27 16:12:52 -04:00
Joey Hess
f0d1af74e7 Merge branch 'automerge' 2012-06-27 16:12:28 -04:00
Joey Hess
36ddb81df6 use "variant" rather than "version" 
While this word may be less familiar to some users, it avoids the
connotation that version 2 is better than version 1, which is wrong
when the two variants were conflicting.
 2012-06-27 16:09:17 -04:00
Joey Hess
054ddda18a better filenames for conflict resolution files 2012-06-27 16:03:42 -04:00
Joey Hess
9147ad7493 commit merge resolution 
this is necessary so the sync can continue successfully with its push phase
 2012-06-27 15:06:47 -04:00
Joey Hess
8810e57995 fix file name 2012-06-27 15:00:26 -04:00
Joey Hess
855eca0cc6 close 2012-06-27 13:38:21 -04:00
Joey Hess
abd36ed336 don't automerge when the symlinks cannot be parsed as keys 2012-06-27 13:35:02 -04:00
Joey Hess
048b64024a sync: Automatically resolves merge conflicts. 
untested, but it compiles :)
 2012-06-27 13:08:32 -04:00
Joey Hess
051c68041b properly handle deleted files when processing ls-files --unmerged 2012-06-27 12:11:03 -04:00
Joey Hess
8e8439a519 add ls-files --unmerged support 2012-06-27 09:27:59 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkWzAq6TusMi9zI3FLkDOETRIAUTtmGZVg
46c39888df Added a comment 2012-06-27 12:56:37 +00:00
http://joeyh.name/
48c0fd4bed Added a comment 2012-06-27 12:36:09 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkwR9uOA38yi5kEUvcEWNtRiZwpxXskayE
38571d8133 Added a comment 2012-06-27 08:54:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
b356015cf4 2012-06-27 06:50:41 +00:00
http://joeyh.name/
f6f4b5dfaa Added a comment 2012-06-27 03:08:13 +00:00
Joey Hess
6f45827fe0 git-config fileEncoding 
Accept arbitrarily encoded repository filepaths etc when reading git config
output. This fixes support for remotes with unusual characters in their
names.

For example, a remote with a url of /tmp/çüş was previously
skipped, because the filename wasn't encoded right so it didn't think it
was available. And when setting the annex-uuid of a remote named "çüş",
it used to add it under a mis-encoded form of the remote's name. Both these
cases now work ok in my testing.
 2012-06-26 23:07:11 -04:00
Joey Hess
1093d82f6b Got rid of the last place that did utf8 decoding. 
Probably fixes bugs/git-annex:_Cannot_decode_byte___39____92__xfc__39__/
although I don't know how to reproduce that bug.
 2012-06-26 22:58:44 -04:00
http://joeyh.name/
5faaf59368 Added a comment 2012-06-27 02:48:31 +00:00
Joey Hess
6e89513ca3 Merge branch 'master' of ssh://git-annex.branchable.com 2012-06-26 22:35:28 -04:00
Joey Hess
6aee7e5a8b Better fix for unavailable local remotes 
Not including such remotes turned out to have other consequences,
including annex-truselevel git config being ignored. Instead, add guards
before each operation that might try to operate on such a repo.
 2012-06-26 22:27:30 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkWzAq6TusMi9zI3FLkDOETRIAUTtmGZVg
06aeff9c7d 2012-06-27 00:33:04 +00:00
Joey Hess
1eff74dd44 blog for the day 2012-06-26 19:25:46 -04:00
Joey Hess
7e62e57f8c Avoid ugly failure mode when moving content from a local repository that is not available. 
Prelude.undefined error message was introduced by
bb4f31a0ee.

It seems best to filter out local repositories that cannot be accessed
from the list of remotes, rather than keeping them in and making every
thing that uses the list have to deal with remotes that may have an unknown
location.

Besides fixing the error message, this also makes unavailable local
remotes' names not be shown in various messages, including in git annex
status output.

Also, move --to an unavailable local repository now avoids some ugly
errors like "changeWorkingDirectory: does not exist".
 2012-06-26 17:22:44 -04:00
Joey Hess
a7b8c807d9 new bug I noticed 2012-06-26 12:37:04 -04:00
Joey Hess
41fcb3d852 Version build dependency on STM, and allow building without it, which disables the watch command. 2012-06-26 09:15:47 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmURXBzaYE1gmVc-X9eLAyDat_6rHPl670
6168795c1a 2012-06-26 08:32:16 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmURXBzaYE1gmVc-X9eLAyDat_6rHPl670
f72dd3e7e5 2012-06-26 08:31:48 +00:00
Joey Hess
336cee671e blog for the day 2012-06-25 20:40:58 -04:00
Joey Hess
17a8f60710 Merge branch 'master' of ssh://git-annex.branchable.com 2012-06-25 20:17:54 -04:00
http://joeyh.name/
e3163bf416 Added a comment 2012-06-25 15:45:18 +00:00
http://joeyh.name/
61091915f6 Added a comment 2012-06-25 15:42:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
7e8a6e76b1 2012-06-25 15:38:57 +00:00
http://joeyh.name/
07c15d9a17 Added a comment 2012-06-25 15:38:44 +00:00
Joey Hess
cede7bdcde cabal: Only try to use inotify on Linux. 2012-06-25 11:38:42 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
0b04ff6431 2012-06-25 15:32:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
2e92f95edc 2012-06-25 15:30:00 +00:00
http://joeyh.name/
4884f18922 Added a comment 2012-06-25 15:29:30 +00:00