mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

sync: When in an adjusted branch, merge changes from the original branch

Browse source 
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
This commit is contained in:
Joey Hess 2023-07-06 12:42:00 -04:00
parent 51b24aac91
commit 240bae38f6
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
6 changed files with 72 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/bugs/annex_sync_silently_resets_master_to_previous_sync.mdwn
View file

@ -22,3 +22,5 @@ PS investigation of adjusted/unlocked came up in ReproNim context where people w
[[!meta author=yoh]]
[[!tag projects/repronim]]
> [[fixed|done]] --[[Joey]]

8
doc/bugs/annex_sync_silently_resets_master_to_previous_sync/comment_3_80d241b2654856669d82d1ab5de40c00._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="joey"
subject="""comment 3"""
date="2023-07-06T16:16:36Z"
content="""
Ok, fixed git-annex sync to immediately merge the changes from the original
branch into the adjusted branch.
"""]]