git-annex/Git
Joey Hess 0214e0fb17 union merge bugfix
Union merges involving two or more repositories could sometimes result in
data from one repository getting lost. This could result in the location
log data becoming wrong, and fsck being needed to fix it.

NB: I audited for any other occurrences of this problem. There are other
places than union merge where multiple changes are fed into update-index
in a stream, but they all involve working copy files being staged, or their
deletion being staged, and in this case it's fine for the later changes
to override the earlier ones.
2013-01-16 21:31:06 -04:00
..
AutoCorrect.hs finished where indentation changes 2012-12-13 00:24:19 -04:00
Branch.hs finished where indentation changes 2012-12-13 00:24:19 -04:00
CatFile.hs finished where indentation changes 2012-12-13 00:24:19 -04:00
CheckAttr.hs finished where indentation changes 2012-12-13 00:24:19 -04:00
Command.hs finished where indentation changes 2012-12-13 00:24:19 -04:00
Config.hs finished where indentation changes 2012-12-13 00:24:19 -04:00
Construct.hs whitespace fixes 2012-12-13 00:45:27 -04:00
CurrentRepo.hs finished where indentation changes 2012-12-13 00:24:19 -04:00
DiffTree.hs direct mode merging works! 2012-12-18 15:04:44 -04:00
Filename.hs handle C-style escapes in Format 2011-12-23 01:05:16 -04:00
FilePath.hs add support for staging other types of blobs, like symlinks, into the index 2012-06-06 14:26:15 -04:00
HashObject.hs finished where indentation changes 2012-12-13 00:24:19 -04:00
Index.hs finished where indentation changes 2012-12-13 00:24:19 -04:00
LsFiles.hs make startup scan for deleted files work in direct mode 2012-12-24 14:24:13 -04:00
LsTree.hs Merge branch 'master' into desymlink 2012-12-13 00:29:06 -04:00
Merge.hs typo 2012-07-17 14:51:42 -04:00
Queue.hs finished where indentation changes 2012-12-13 00:24:19 -04:00
Ref.hs finished where indentation changes 2012-12-13 00:24:19 -04:00
Remote.hs webapp: Generate better git remote names. 2012-10-31 15:26:19 -04:00
Sha.hs whitespace fixes 2012-12-13 00:45:27 -04:00
SharedRepository.hs Support git's core.sharedRepository configuration 2012-04-21 15:36:52 -04:00
Types.hs thread safe git-annex index file use 2012-08-24 20:50:39 -04:00
UnionMerge.hs union merge bugfix 2013-01-16 21:31:06 -04:00
UpdateIndex.hs finished where indentation changes 2012-12-13 00:24:19 -04:00
Url.hs finished where indentation changes 2012-12-13 00:24:19 -04:00
Version.hs finished where indentation changes 2012-12-13 00:24:19 -04:00