https://www.google.com/accounts/o8/id?id=AItOawnHrjHxJAm39x8DR4bnbazQO6H0nMNuY9c
edee8ad05b
Added a comment: gnu commands
2012-07-01 17:03:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnHrjHxJAm39x8DR4bnbazQO6H0nMNuY9c
768036f3dd
Added a comment: sha256 alternative
2012-06-30 14:34:12 +00:00
Philipp Kern
49136c22d0
doc/download.mdwn: document no-s3 and assistant branches
2012-06-30 15:00:00 +02:00
Joey Hess
660f81d2b2
blog for the day
2012-06-29 15:44:14 -04:00
Joey Hess
c79625290a
improving transfer data types and design
2012-06-29 14:12:16 -04:00
Joey Hess
0ed7db5f3a
add news item for git-annex 3.20120629
2012-06-29 14:03:37 -04:00
Joey Hess
61786c52ad
releasing version 3.20120629
2012-06-29 14:03:03 -04:00
Joey Hess
26208b93e5
Merge branch 'master' of ssh://git-annex.branchable.com
2012-06-29 12:55:39 -04:00
Joey Hess
e7182ad119
further design
2012-06-29 11:59:25 -04:00
Joey Hess
29335bf326
pointlessness
2012-06-29 10:00:05 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
6b84f23317
Added a comment
2012-06-29 12:02:49 +00:00
Joey Hess
397117429c
simplify
...
modifyMVar_ catches exceptions, so no need to roll my own
2012-06-28 23:40:16 -04:00
Joey Hess
247099f628
refactor
2012-06-28 20:01:03 -04:00
Joey Hess
cd0ab91c91
blog for the day
2012-06-28 18:23:48 -04:00
Joey Hess
39569e889a
blog for the day
2012-06-28 18:22:43 -04:00
Joey Hess
c7328556a3
update
2012-06-28 14:48:46 -04:00
Joey Hess
638a321ca5
typo
2012-06-28 14:15:49 -04:00
Joey Hess
421f9ce0e2
fix kqueue build
2012-06-28 14:13:15 -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
Joey Hess
a3636602ab
MVar deadlock problem seems to be fixed by previous commit
2012-06-28 13:47:15 -04:00
Joey Hess
4888c5b042
improve thread termination handling
...
The reason the DirWatcher had to wait for program termination was because
it used withINotify, so when it finished, its watcher threads were killed.
But since I have two DirWatcher threads now, that was not good, and could
perhaps explain the MVar problem I saw yesterday. In any case, fixed this
part of the code by making the DirWatcher return a handle that can be used
to stop it, and now the main Assistant thread is the only one calling
waitForTermination.
2012-06-28 13:37:03 -04:00
Joey Hess
40f357fdcf
tweak
2012-06-28 13:04:02 -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
fb51d99951
merge conflict resolution now working
...
Avoid MVar deadlock issue, which I don't understand.
Have not taken the time to debug it fully, because it turns out I don't
need to resolve merge conflicts when a new branch ref is written... I
think.
Ensure the git-annex branch is merged when doing a manual pull.
Otherwise it can get out of sync, since git-annex normally only merges it
once per run.
2012-06-27 20:50:50 -04:00
Joey Hess
59b5266ad1
actually fetch from remote when doing a manual pull
...
forgot to do this
2012-06-27 20:30:04 -04:00
Joey Hess
783bee285f
automatic conflict resolution for assistant
2012-06-27 20:06:21 -04:00
Joey Hess
2e501364d4
Merge branch 'master' into assistant
2012-06-27 18:09:11 -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
8baff14054
Merge branch 'master' into assistant
2012-06-27 16:14:33 -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
