projects / git-annex.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 51b24aa) | patch
sync: When in an adjusted branch, merge changes from the original branch
authorJoey Hess <joeyh@joeyh.name>
Thu, 6 Jul 2023 16:42:00 +0000 (12:42 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 6 Jul 2023 16:42:24 +0000 (12:42 -0400)
commit240bae38f652598a53d4a6cd04579b331f1eadec
tree4dd207d40d0f018941084c03863cb690b6415f10tree | snapshot
parent51b24aac917de56639f00f960101e6b228925529commit | diff
sync: When in an adjusted branch, merge changes from the original branch

This causes changes to the original branch to get merged with a single
sync. Before, it took 2 syncs; the first happened to update the synced/
branch, and the second merged changes from the synced/ branch into the
ajusted branch.

Using mergeToAdjustedBranch when tomerge == origbranch is probably
overkill, but it does work fine.

Sponsored-By: the NIH-funded NICEMAN (ReproNim TR&D3) project
Annex/AdjustedBranch/Merge.hs diff | blob | history
Assistant/Threads/Merger.hs diff | blob | history
Command/Merge.hs diff | blob | history
Command/Sync.hs diff | blob | history
doc/bugs/annex_sync_silently_resets_master_to_previous_sync.mdwn diff | blob | history
doc/bugs/annex_sync_silently_resets_master_to_previous_sync/comment_3_80d241b2654856669d82d1ab5de40c00._comment [new file with mode: 0644] blob
Unnamed repository; edit this file 'description' to name the repository.