mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
git-annex/Annex
History
Joey Hess fb88e0f02c fix 1192d98721 to handle annexed files in conflicted merge 
In the case of a conflicted merge where the remote adds a directory, and we
have a file (which is checked in), resolveMerge' will create the link,
and so the fix for 1192d98721 looked at that,
thought it was an unannexed file (it's not in the oldref), and preserved
it.

This is a hacky fix. It would be better for resolveMerge' to not update the
work tree, at least in direct mode, and only stage the changes, which
mergeDirectCleanUp could then move into tree. I want to make that change,
but this is not the time to do it.
2014-03-03 17:09:53 -04:00
..
Branch add metadata command to get/set metadata 2014-02-12 21:30:33 -04:00
Content random hlint (to give the autobuilder something new to build) 2014-02-11 00:41:19 -04:00
Direct fix reversion in relative paths to local remotes of direct mode repos 2013-11-26 19:33:26 -04:00
View fix test to work on Windows 2014-02-25 18:09:45 -04:00
Branch.hs remove Read instance for Ref 2014-02-19 01:19:57 -04:00
BranchState.hs remove git-annex branch read cache 2012-10-19 14:25:15 -04:00
CatFile.hs sync: Fix bug in direct mode that caused a file not checked into git to be deleted when merging with a remote that added a file by the same name. (Thanks, jkt) 2014-03-03 14:57:16 -04:00
CheckAttr.hs finished where indentation changes 2012-12-13 00:24:19 -04:00
CheckIgnore.hs hlint 2013-09-25 03:09:06 -04:00
Content.hs Put non-object tmp files in .git/annex/misctmp, leaving .git/annex/tmp for only partially transferred objects. 2014-02-26 16:52:56 -04:00
Direct.hs fix 1192d98721 to handle annexed files in conflicted merge 2014-03-03 17:09:53 -04:00
Drop.hs remove some monkey faces 2014-02-01 17:14:38 -04:00
Environment.hs hlint 2013-09-25 03:09:06 -04:00
Exception.hs rework annexed object locking in direct mode & support Windows 2014-01-28 16:43:11 -04:00
FileMatcher.hs limiting files based on metadata 2014-02-13 02:24:30 -04:00
Hook.hs fix handling of nonexistant hook 2014-03-03 13:59:36 -04:00
Index.hs add git annex view command 2014-02-18 18:22:20 -04:00
Init.hs Put non-object tmp files in .git/annex/misctmp, leaving .git/annex/tmp for only partially transferred objects. 2014-02-26 16:52:56 -04:00
Journal.hs Put non-object tmp files in .git/annex/misctmp, leaving .git/annex/tmp for only partially transferred objects. 2014-02-26 16:52:56 -04:00
Link.hs add git annex view command 2014-02-18 18:22:20 -04:00
LockPool.hs use locking on Windows 2014-01-28 14:42:03 -04:00
MetaData.hs metadata: FIeld names are now case insensative. 2014-02-25 18:45:09 -04:00
Path.hs move programPath out of Config.Files to Annex.Path 2013-11-24 16:03:03 -04:00
Perms.hs Ensure execute bit is set on directories when core.sharedrepsitory is set. 2013-11-18 18:13:09 -04:00
Queue.hs type based git config handling for remotes 2013-01-01 13:58:14 -04:00
Quvi.hs Probe for quvi version at run time. 2014-02-28 14:54:02 -04:00
ReplaceFile.hs Put non-object tmp files in .git/annex/misctmp, leaving .git/annex/tmp for only partially transferred objects. 2014-02-26 16:52:56 -04:00
Ssh.hs random hlint (to give the autobuilder something new to build) 2014-02-11 00:41:19 -04:00
TaggedPush.hs remove Read instance for Ref 2014-02-19 01:19:57 -04:00
Url.hs add UrlOptions sum type 2014-02-24 22:00:25 -04:00
UUID.hs automatically derive an annex-uuid from a gcrypt-uuids 2013-09-05 16:02:39 -04:00
VariantFile.hs sync: Fix bug in direct mode that caused a file not checked into git to be deleted when merging with a remote that added a file by the same name. (Thanks, jkt) 2014-03-03 14:57:16 -04:00
Version.hs Auto-upgrade v3 indirect repos to v5 with no changes. This also fixes a problem when a direct mode repo was somehow set to v3 rather than v4, and so the automatic direct mode upgrade to v5 was not done. 2013-12-29 13:06:23 -04:00
View.hs fix combining of FIlterValues 2014-03-02 15:44:14 -04:00
Wanted.hs fix transfers of key with no associated file 2014-01-23 16:44:02 -04:00