Joey Hess
088816353e
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-10 15:18:02 -04:00
http://joeyh.name/
d651e3cf7a
Added a comment
2014-07-10 19:19:36 +00:00
http://joeyh.name/
2a7fd68d47
Added a comment
2014-07-10 19:10:15 +00:00
Joey Hess
be2c77d0cb
close
2014-07-10 15:08:30 -04:00
Joey Hess
3c10d8ce57
retitle
2014-07-10 15:05:01 -04:00
Joey Hess
b9892e2344
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-10 15:02:30 -04:00
http://joeyh.name/
56b2b49440
Added a comment: user misconfiguration
2014-07-10 19:02:00 +00:00
Joey Hess
5d34472f82
close; user misconfiguration
2014-07-10 15:00:22 -04:00
http://joeyh.name/
4f62105aa3
Added a comment
2014-07-10 18:48:17 +00:00
Joey Hess
e538f0e980
notabug
2014-07-10 14:24:46 -04:00
http://joeyh.name/
fc48c3bb23
Added a comment
2014-07-10 18:24:17 +00:00
Joey Hess
4c61590541
tagging
2014-07-10 14:22:54 -04:00
http://joeyh.name/
50781a4a5f
Added a comment
2014-07-10 18:11:22 +00:00
Joey Hess
f15d2aa35d
update
2014-07-09 16:16:32 -04:00
Joey Hess
566e8041ae
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-09 15:32:21 -04:00
http://joeyh.name/
dd171168e4
Added a comment: more confirmation of race theory
2014-07-09 19:26:55 +00:00
Joey Hess
99521fee79
close, with fairly high confidence, but not certainty, due to difficulty reproducing races..
2014-07-09 15:21:27 -04:00
Joey Hess
6fe35aab87
Really fix bug that caused the assistant to make many unncessary empty merge commits.
2014-07-09 15:18:00 -04:00
Joey Hess
d76b5a674f
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-09 15:09:49 -04:00
Joey Hess
58acaf8026
prospective fix for bad_merge_commit_deleting_all_files
...
Assuming my analysis of a race is correct. In any case, this certianly closes a
race..
2014-07-09 15:08:19 -04:00
http://joeyh.name/
2e102ce248
Added a comment
2014-07-09 19:01:33 +00:00
http://joeyh.name/
73271cbcf4
Added a comment
2014-07-09 19:00:35 +00:00
Joey Hess
4915f9ad03
format
2014-07-09 14:50:42 -04:00
http://jamesjustjames.wordpress.com/
dbfab63576
removed
2014-07-09 18:51:27 +00:00
http://jamesjustjames.wordpress.com/
bf2ac843d2
Added a comment: The guy with this bug.
2014-07-09 18:50:36 +00:00
http://jamesjustjames.wordpress.com/
36de0da227
Added a comment: The guy with this bug.
2014-07-09 18:50:25 +00:00
http://joeyh.name/
07bb6b3748
Added a comment
2014-07-09 18:36:36 +00:00
http://joeyh.name/
5fe0f1e939
Added a comment: theory
2014-07-09 18:31:07 +00:00
http://joeyh.name/
b76295a396
Added a comment
2014-07-09 18:25:08 +00:00
http://joeyh.name/
7871699567
Added a comment
2014-07-09 18:20:14 +00:00
Joey Hess
4de0b1693e
more info
2014-07-09 13:43:22 -04:00
Joey Hess
6272d09031
bug
2014-07-09 13:39:02 -04:00
http://svario.it/gioele
9ca4270cce
new bug gpg does not ask for password inside tmux
2014-07-09 16:54:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmTNrhkVQ26GBLaLD5-zNuEiR8syTj4mI8
856bfcfccf
Added a comment: Same happening here
2014-07-09 14:45:32 +00:00
http://mildred.fr/
855409db88
2014-07-09 14:17:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnu1NjsjNS3m0OxiYLKO-5SKNpSERxpi6k
ac4149706f
Added a comment
2014-07-09 13:56:31 +00:00
zardoz
6b165db9cc
Added a comment
2014-07-09 09:02:59 +00:00
zardoz
7ed729ae51
Added a comment
2014-07-09 08:51:22 +00:00
zardoz
b78752480e
2014-07-09 08:39:58 +00:00
EskildHustvedt
3cf23c5b47
Added a comment
2014-07-09 00:24:37 +00:00
EskildHustvedt
99424c47d4
Reopening
2014-07-09 00:15:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn0aWOz5xMj5VuexPl55h7IasQnsh7sVwE
4f5a81dac4
Added a comment: It works now
2014-07-08 22:47:08 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnNqLKszWk9EoD4CDCqNXJRIklKFBCN1Ao
15f3602f61
Added a comment: package in debian backports shows the same error mesage
2014-07-08 19:25:19 +00:00
zardoz
c61fdd140e
Added a comment
2014-07-08 19:17:29 +00:00
Joey Hess
7db532d53b
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-08 13:57:39 -04:00
Joey Hess
ba42b67c70
Fix bug in automatic merge conflict resolution
...
When one side is an annexed symlink, and the other side is a non-annexed symlink.
In this case, git-merge does not replace the annexed symlink in the work
tree with the non-annexed symlink, which is different from it's handling of
conflicts between annexed symlinks and regular files or directories.
So, while git-annex generated the correct merge commit, the work tree
didn't get updated to reflect it.
See comments on bug for additional analysis.
Did not add this to the test suite yet; just unloaded a truckload of firewood
and am feeling lazy.
This commit was sponsored by Adam Spiers.
2014-07-08 13:55:11 -04:00
http://joeyh.name/
3dcb349409
Added a comment: analysis
2014-07-08 17:52:59 +00:00
Joey Hess
1d966dbe37
confirmed
2014-07-08 12:57:43 -04:00
Joey Hess
67c4cef5e9
fixed
2014-07-08 12:57:13 -04:00
http://joeyh.name/
8c9c55c8ce
Added a comment
2014-07-08 16:44:32 +00:00
