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
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
42df533f9c
2014-07-08 14:06:31 +00:00
CandyAngel
ac8f1925be
2014-07-08 11:56:54 +00:00
EskildHustvedt
e66d336976
Added a comment
2014-07-08 08:13:40 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn0aWOz5xMj5VuexPl55h7IasQnsh7sVwE
2de177aba4
2014-07-08 00:34:53 +00:00
Joey Hess
f0c48e8591
moreinfo
2014-07-07 13:42:46 -04:00
Joey Hess
8116d10b8f
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-07 13:31:22 -04:00
Joey Hess
da3d7a369b
confirm
2014-07-07 13:31:13 -04:00
http://joeyh.name/
09ac7438d3
Added a comment
2014-07-07 17:19:03 +00:00
http://joeyh.name/
3d054deb7d
Added a comment
2014-07-07 17:17:50 +00:00
zardoz
8037a3ad73
Added a comment
2014-07-07 14:09:33 +00:00
zardoz
27bc6d8425
2014-07-07 13:48:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
8a1351cea5
Added a comment
2014-07-05 22:29:01 +00:00
http://joeyh.name/
bf03ab3874
Added a comment
2014-07-05 21:55:46 +00:00
http://joeyh.name/
6cdcdea98b
2014-07-05 21:48:42 +00:00
http://joeyh.name/
cd6c771715
Added a comment
2014-07-05 21:17:17 +00:00
Joey Hess
eed552609c
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-05 17:13:19 -04:00
Joey Hess
4a66cd3f91
assistant: Fix bug, introduced in last release, that caused the assistant to make many unncessary empty merge commits.
2014-07-05 17:12:05 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
5969ae14e5
2014-07-05 20:57:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
9d7388745e
2014-07-05 20:56:04 +00:00
http://joeyh.name/
e08ef580ed
Added a comment
2014-07-05 20:34:39 +00:00
EskildHustvedt
5ace35dfb9
2014-07-05 05:15:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
f973499dad
Added a comment
2014-07-04 22:30:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
e38fec4f52
Added a comment
2014-07-04 22:28:27 +00:00
http://joeyh.name/
b5659c2a68
Added a comment
2014-07-04 22:09:38 +00:00
Joey Hess
e0fc5bebab
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-04 18:01:02 -04:00
http://joeyh.name/
3208b70a7f
Added a comment
2014-07-04 21:10:17 +00:00
