mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
git-annex/Annex
History
Joey Hess 1503b86a14
make import tree from remote generate a merge commit 
This way no history is lost, neither what was exported to the remote,
or the history of changes that is imported from it. No complicated
correlation of two possibly very different histories is needed, just
record what we know and then git merge will do a good job.

Also, it notices when the remote tracking branch doesn't need to be updated,
and avoids doing anything, so noop remotes are super cheap.

The only catch here is that, since the commits generated for imports
from the remote don't have a stable date or author/committer, each
(non-noop) import generates different commits for the same imported
trees. So, when the imported remote tracking branch is merged into master
and then a change is imported again, there will be an extra series of
commits, which will get more and more expensive each time.

This seems to call for making stable commits for imports. Also that
seems a good idea to make importing in several repositories have the
same result.
2019-04-30 16:13:21 -04:00
..
AdjustedBranch refactor getCurrentBranch 2018-10-19 17:29:18 -04:00
Branch update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Content update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
LockPool update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
MetaData update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
View update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Action.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
AdjustedBranch.hs misctmp cleanup 2019-01-17 16:02:22 -04:00
AutoMerge.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
BloomFilter.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
BranchState.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
ChangedRefs.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
Common.hs finally really add back custom-setup stanza 2017-12-31 16:36:39 -04:00
Concurrent.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Content.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
CurrentBranch.hs refactor getCurrentBranch 2018-10-19 17:29:18 -04:00
Difference.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Direct.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
DirHashes.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Drop.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Environment.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Export.hs improve messages around export/import conflicts 2019-04-09 13:03:59 -04:00
FileMatcher.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Fixup.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
GitOverlay.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
Hook.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Import.hs make import tree from remote generate a merge commit 2019-04-30 16:13:21 -04:00
Ingest.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Init.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
InodeSentinal.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Journal.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Link.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Locations.hs remove wrong uniqueness constraint from ContentIdentifier db 2019-04-09 19:58:24 -04:00
LockFile.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
LockPool.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Magic.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
MakeRepo.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
MetaData.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Multicast.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Notification.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
NumCopies.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Path.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Perms.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
RemoteTrackingBranch.hs refactor RemoteTrackingBranch 2019-03-01 14:47:56 -04:00
ReplaceFile.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
SpecialRemote.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
TaggedPush.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Tmp.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Transfer.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
UpdateInstead.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
UUID.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
VariantFile.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
VectorClock.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Version.hs fix init in cripped filesystem version issues 2018-12-03 12:57:23 -04:00
View.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Wanted.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
WorkTree.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
YoutubeDl.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00