martin
9ece87c421
Added a comment: git-annex add (called by sync) should do the job and bring the files back home (IMHO)
2014-06-10 15:58:25 +00:00
Joey Hess
2dfbbc6b43
Merge branch 'master' of ssh://git-annex.branchable.com
2014-06-09 19:47:31 -04:00
Joey Hess
d6711800ad
avoid bad commits after interrupted direct mode sync (or merge)
...
It was possible for a interrupted sync or merge in direct mode to
leave the work tree out of sync with the last recorded commit.
This would result in the next commit seeing files missing from the work
tree, and committing their removal.
Now, a direct mode merge happens not only in a throwaway work tree, but using
a temporary index file, and without any commits or index changes
being made until the real work tree has been updated. If the merge is
interrupted, the work tree may have some updated files, but worst case a
commit will redundantly commit changes that come from the merge.
This commit was sponsored by Tony Cantor.
2014-06-09 19:40:28 -04:00
Joey Hess
193e702d73
harder
2014-06-09 17:43:49 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk7iPiqWr3BVPLWEDvJhSSvcOqheLEbLNo
b36bad94a1
Added a comment
2014-06-09 21:16:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
fe4eb0517d
Added a comment
2014-06-09 20:34:55 +00:00
Joey Hess
920794ab6b
bug
2014-06-09 15:43:52 -04:00
Joey Hess
70a00802a6
Merge branch 'master' of ssh://git-annex.branchable.com
2014-06-09 15:32:24 -04:00
http://joeyh.name/
49cc5e1594
Added a comment
2014-06-09 19:29:09 +00:00
Joey Hess
7671d228af
Avoid leaving behind .tmp files when failing in some cases, including importing files to a disk that is full.
2014-06-09 15:24:05 -04:00
Joey Hess
24915adab7
tagging
2014-06-09 15:09:03 -04:00
http://joeyh.name/
f50e8acb99
Added a comment
2014-06-09 18:57:25 +00:00
http://joeyh.name/
7dd162ba1f
Added a comment
2014-06-09 18:46:01 +00:00
Joey Hess
787d9e27ba
Ignore setsid failures.
2014-06-09 14:44:18 -04:00
Joey Hess
b6274745b4
Merge branch 'master' of ssh://git-annex.branchable.com
2014-06-09 14:43:49 -04:00
Joey Hess
1d4ba328e5
close; forwarded
2014-06-09 13:40:29 -04:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
4b270fda85
Describe bug.
2014-06-08 12:54:27 +00:00
martin
f476e96e43
Added a comment: use case and answer to joey's question "...then when..."
2014-06-08 04:59:42 +00:00
EskildHustvedt
15f043b20c
Added a comment
2014-06-07 05:47:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5WyknJirJJridJjiPNgrlYxGG9xrZBvA
f490015d6c
Added a comment: a different fix
2014-06-07 04:27:49 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk7iPiqWr3BVPLWEDvJhSSvcOqheLEbLNo
9600e79f76
2014-06-06 22:42:03 +00:00
http://joeyh.name/
602499771b
Added a comment
2014-06-06 16:53:21 +00:00
EskildHustvedt
48793b6cec
Added a comment
2014-06-06 16:13:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5WyknJirJJridJjiPNgrlYxGG9xrZBvA
b8717938d1
2014-06-06 11:02:35 +00:00
Joey Hess
ded79929bc
Merge branch 'master' of ssh://git-annex.branchable.com
2014-06-05 15:55:01 -04:00
martin
5d8f87e530
Added a comment: another scenario
2014-06-05 19:52:05 +00:00
Joey Hess
a0c8b8493c
Merge branch 'master' of ssh://git-annex.branchable.com
2014-06-05 15:35:33 -04:00
Joey Hess
eb86f1338f
wip
2014-06-05 15:31:23 -04:00
http://joeyh.name/
84596620a6
Added a comment
2014-06-05 19:20:20 +00:00
http://joeyh.name/
9235c146fb
Added a comment
2014-06-05 19:06:36 +00:00
martin
af1f0fdd5c
Added a comment: It confuses users
2014-06-05 19:05:12 +00:00
Joey Hess
cafe82b542
Merge branch 'master' of ssh://git-annex.branchable.com
2014-06-05 14:59:25 -04:00
http://joeyh.name/
ef18a3a2e6
Added a comment
2014-06-05 18:29:15 +00:00
Joey Hess
d69c78483c
confirmed
2014-06-05 13:37:26 -04:00
http://joeyh.name/
39baba0cd2
Added a comment
2014-06-05 17:37:08 +00:00
https://launchpad.net/~eliasson
ab9f45f2dc
Added a comment
2014-06-05 17:15:32 +00:00
http://joeyh.name/
11f4218682
Added a comment
2014-06-05 17:06:40 +00:00
jamieson
67f531cd1f
Added a comment
2014-06-05 16:56:33 +00:00
http://joeyh.name/
bc45f680c9
Added a comment
2014-06-05 16:51:42 +00:00
http://joeyh.name/
b7cbb7d227
Added a comment
2014-06-05 16:50:30 +00:00
jamieson
64507e07eb
Added a comment
2014-06-05 16:50:20 +00:00
http://joeyh.name/
81202e2360
Added a comment
2014-06-05 16:37:27 +00:00
Joey Hess
022fb1f45d
dup
2014-06-05 12:25:06 -04:00
modules
8551998306
removed
2014-06-05 11:24:40 +00:00
modules
0ce5861618
2014-06-05 10:55:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5WyknJirJJridJjiPNgrlYxGG9xrZBvA
63859347f3
2014-06-05 10:21:13 +00:00
Joey Hess
6ba5df201e
Merge branch 'master' of ssh://git-annex.branchable.com
2014-06-04 14:37:20 -04:00
http://joeyh.name/
575ae39bea
Added a comment
2014-06-04 18:14:19 +00:00
http://joeyh.name/
4111c4a4f6
Added a comment
2014-06-04 18:08:39 +00:00
Joey Hess
ee63c59644
close; dup of fixed bug
2014-06-04 14:07:30 -04:00
