mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
git-annex/Git
History
Joey Hess 97fd9da6e7
add back non-preferred files to imported tree 
Prevents merging the import from deleting the non-preferred files from
the branch it's merged into.

adjustTree previously appended the new list of items to the old, which
could result in it generating a tree with multiple files with the same
name. That is not good and confuses some parts of git. Gave it a
function to resolve such conflicts.

That allowed dealing with the problem of what happens when the import
contains some files (or subtrees) with the same name as files that were
filtered out of the export. The files from the import win.
2019-05-20 16:43:52 -04:00
..
Command update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Remote update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
AutoCorrect.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Branch.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
BuildVersion.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
CatFile.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
CheckAttr.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
CheckIgnore.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Command.hs fix incorrect comment 2019-04-24 14:29:46 -04:00
Config.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
ConfigTypes.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Construct.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
CurrentRepo.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
DiffTree.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
DiffTreeItem.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Env.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
FileMode.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Filename.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
FilePath.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Fsck.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
GCrypt.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
HashObject.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
History.hs don't empty historyCommitParents 2019-05-01 13:38:40 -04:00
Hook.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Index.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
LockFile.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
LsFiles.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
LsTree.hs add back non-preferred files to imported tree 2019-05-20 16:43:52 -04:00
Merge.hs fix test suite when git is too old to understand --allow-unrelated-histories 2019-03-22 13:49:22 -04:00
Objects.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Queue.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Ref.hs add --verify 2019-05-06 16:41:01 -04:00
RefLog.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Remote.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Repair.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Sha.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Ssh.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Status.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Tree.hs add back non-preferred files to imported tree 2019-05-20 16:43:52 -04:00
Types.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
UnionMerge.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
UpdateIndex.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Url.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Version.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00