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
http://joeyh.name/
0c4f66f0c6
Added a comment
2014-07-08 17:31:53 +00:00
zardoz
5340e632ec
2014-07-08 17:22:51 +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
Joey Hess
58dcefc55e
Merge branch 'master' of ssh://git-annex.branchable.com
2014-07-08 12:47:16 -04:00
Joey Hess
eef8e8c51a
Fix git version that supported --no-gpg-sign.
...
This is weird, git describe said the commit landed in 1.8.5, but 1.9.3 does
not have it on OSX. Assume 2.0.0.
2014-07-08 12:46:15 -04:00
http://joeyh.name/
8c9c55c8ce
Added a comment
2014-07-08 16:44:32 +00:00
Joey Hess
eb015a1c96
update month
2014-07-08 12:39:07 -04:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
42df533f9c
2014-07-08 14:06:31 +00:00
zardoz
1b3c94b82d
2014-07-08 13:16:10 +00:00
zardoz
0b1ec79069
Added a comment
2014-07-08 12:26:59 +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
divB
67d4430b6e
2014-07-08 07:41:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnX1msQxnLoSeu7q-i-c9BWghonsN7Qmns
6a170c6671
2014-07-08 06:38:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn0aWOz5xMj5VuexPl55h7IasQnsh7sVwE
2de177aba4
2014-07-08 00:34:53 +00:00
feulif
cc3f94c838
2014-07-07 22:03:53 +00:00
Joey Hess
45119da4de
devblog
2014-07-07 16:11:10 -04:00
Joey Hess
4396d3100c
typo
2014-07-07 14:30:38 -04:00
Joey Hess
a8e11fe1ea
android version
2014-07-07 14:27:40 -04:00
Joey Hess
923b436c08
fix heights
2014-07-07 13:57:34 -04:00
Joey Hess
c415ab16f0
fix heights
2014-07-07 13:57:15 -04:00
Joey Hess
90776d8bd6
fix heights
2014-07-07 13:56:29 -04:00
Joey Hess
dfb2bce3c4
fix heights
2014-07-07 13:55:56 -04:00
Joey Hess
46b7cc3216
fix heights
2014-07-07 13:55:29 -04:00
Joey Hess
4b04bf0f71
fix heights
2014-07-07 13:54:44 -04:00
Joey Hess
a2cd37945f
reorg
2014-07-07 13:53:45 -04:00
Joey Hess
6b936a638f
fix
2014-07-07 13:51:29 -04:00
Joey Hess
e819c0ab29
add display of build-version files
2014-07-07 13:49:17 -04: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
Joey Hess
2b61066bed
add news item for git-annex 5.20140707
2014-07-07 12:41:47 -04:00
Joey Hess
fd2f050a74
network-conduit build dep in cabal was spuriious, remove
2014-07-07 12:31:27 -04:00
Joey Hess
6bd4e3b690
prep release
2014-07-07 12:25:06 -04:00
Joey Hess
33ad8beabb
Support building with bloomfilter 2.0.0.
2014-07-07 12:24:12 -04:00
zardoz
8037a3ad73
Added a comment
2014-07-07 14:09:33 +00:00
zardoz
27bc6d8425
2014-07-07 13:48:44 +00:00
zardoz
32a0403542
Added a comment
2014-07-07 12:48:07 +00:00
zardoz
fddbec98f5
2014-07-07 12:06:01 +00:00
Idhup
06fa3db7ee
Added a comment: typo
2014-07-07 10:23:23 +00:00
Idhup
4554acd79b
Added a comment: Connection sharing workaround
2014-07-07 10:20:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkNE-H4vEcbcGndxq5daT8qUb7yIf7r1OE
2e08069c96
Added a comment
2014-07-07 10:06:03 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkNE-H4vEcbcGndxq5daT8qUb7yIf7r1OE
a09b957f66
Added a comment
2014-07-07 10:05:07 +00:00
http://ypid.wordpress.com/
c9903e3ff1
Added a comment: git annex whereis --in origin
2014-07-07 09:45:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkNE-H4vEcbcGndxq5daT8qUb7yIf7r1OE
3827bdc763
Added a comment
2014-07-07 08:40:57 +00:00
