mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
git-annex/Command
History
Joey Hess 751f496c11 add test case & fix conflict resolution bug on Windows & FAT 
Fix bug in automatic merge conflict resolution code when used
on a filesystem not supporting symlinks, which resulted in it losing
track of the symlink bit of annexed files.

This was the underlying bug that was causing another test to fail,
which got worked around in 1c997fd08c.
I've chosen to keep 2 separate test cases since the old test case only
detected the problem accidentially.

Test suite passes on FAT & in windows, as well as on proper unix systems.

This commit was sponsored by Ellis Whitehead.
2014-02-04 17:24:12 -04:00
..
Add.hs Windows: Avoid using unix-compat's rename, which refuses to rename directories. 2014-01-29 15:19:03 -04:00
AddUnused.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
AddUrl.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
Assistant.hs reorg 2014-01-26 16:36:31 -04:00
Commit.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
ConfigList.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Copy.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
Dead.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Describe.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Direct.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Drop.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
DropKey.hs refactor 2014-01-26 15:53:01 -04:00
DropUnused.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
EnableRemote.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
ExamineKey.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
Find.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
Fix.hs Windows: Avoid using unix-compat's rename, which refuses to rename directories. 2014-01-29 15:19:03 -04:00
Forget.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
FromKey.hs Windows: Avoid using unix-compat's rename, which refuses to rename directories. 2014-01-29 15:19:03 -04:00
Fsck.hs avoid using openFile when withFile can be used 2014-02-03 10:19:06 -04:00
FuzzTest.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
GCryptSetup.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Get.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
Group.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Help.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
Import.hs Windows: Avoid using unix-compat's rename, which refuses to rename directories. 2014-01-29 15:19:03 -04:00
ImportFeed.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
InAnnex.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Indirect.hs Windows: Avoid using unix-compat's rename, which refuses to rename directories. 2014-01-29 15:19:03 -04:00
Info.hs Windows: Avoid using unix-compat's rename, which refuses to rename directories. 2014-01-29 15:19:03 -04:00
Init.hs reorg 2014-01-26 16:36:31 -04:00
InitRemote.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
List.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
Lock.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Log.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
LookupKey.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Map.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Merge.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Migrate.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Mirror.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
Move.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
NumCopies.hs reorg 2014-01-21 18:08:56 -04:00
PreCommit.hs avoid using function named that conflicts with name used in newer version of process library 2014-01-29 13:44:53 -04:00
RecvKey.hs Windows: Avoid using unix-compat's rename, which refuses to rename directories. 2014-01-29 15:19:03 -04:00
Reinject.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
ReKey.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Repair.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
RmUrl.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Schedule.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Semitrust.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
SendKey.hs reorg 2014-01-26 16:32:55 -04:00
Status.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
Sync.hs add test case & fix conflict resolution bug on Windows & FAT 2014-02-04 17:24:12 -04:00
Test.hs expose tasty test suite's option parser 2014-01-21 00:08:43 -04:00
TransferInfo.hs reorg 2014-01-26 16:32:55 -04:00
TransferKey.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
TransferKeys.hs reorganize numcopies code (no behavior changes) 2014-01-21 16:08:59 -04:00
Trust.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Unannex.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Ungroup.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Uninit.hs reorg 2014-01-26 16:36:31 -04:00
Unlock.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Untrust.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Unused.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
Upgrade.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Version.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Vicfg.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Wanted.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00
Watch.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
WebApp.hs avoid using function named that conflicts with name used in newer version of process library 2014-01-29 13:44:53 -04:00
Whereis.hs reorganize some files and imports 2014-01-26 16:25:55 -04:00
XMPPGit.hs fix inversion of control in CommandSeek (no behavior changes) 2014-01-20 04:57:36 -04:00