git-annex/Annex
Joey Hess 1b616c5d37 improve handling of receiving object in direct mode when associated files are modified
Before, if a direct mode repo had one or more associated files that
were modifed, moving the object into it would overwrite the associated
files with the pristine object.

Now, modified associated files are left unchanged. To ensure that,
when an object is moved into a direct mode repo, it's not thrown away,
it gets stored in indirect mode.
2013-05-17 16:25:18 -04:00
..
Content store copy in inode cache too 2013-05-17 16:16:10 -04:00
Branch.hs fix android build, broken by changes for windows port 2013-05-16 11:52:48 -04:00
BranchState.hs remove git-annex branch read cache 2012-10-19 14:25:15 -04:00
CatFile.hs Merge branch 'master' into windows 2013-05-15 19:18:04 -04:00
CheckAttr.hs finished where indentation changes 2012-12-13 00:24:19 -04:00
Content.hs improve handling of receiving object in direct mode when associated files are modified 2013-05-17 16:25:18 -04:00
Direct.hs test suite passes in direct mode 2013-05-17 15:59:37 -04:00
Environment.hs fix warnings 2013-05-13 15:30:18 -04:00
Exception.hs fixes for transfer resume 2012-09-24 13:18:16 -04:00
FileMatcher.hs per-IA-item content directories 2013-04-25 23:44:55 -04:00
Journal.hs fix the day's windows permissions damage 2013-05-12 19:09:48 -04:00
Link.hs fix the day's Windows permissions damage 2013-05-14 20:15:14 -04:00
LockPool.hs fix permission damage (thanks, Windows) 2013-05-11 23:54:25 -04:00
Perms.hs fix permission damage (thanks, Windows) 2013-05-11 23:54:25 -04:00
Queue.hs type based git config handling for remotes 2013-01-01 13:58:14 -04:00
ReplaceFile.hs test suite passes in direct mode 2013-05-17 15:59:37 -04:00
Ssh.hs fix imports 2013-05-14 13:53:29 -04:00
TaggedPush.hs expose Control.Monad.join 2013-04-22 20:24:53 -04:00
UUID.hs Now uses the Haskell uuid library, rather than needing a uuid program. 2013-02-10 14:52:54 -04:00
Version.hs git-annex now builds on Windows (doesn't work) 2013-05-11 15:03:00 -05:00
Wanted.hs --auto fixes 2012-12-06 13:22:16 -04:00