diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-03-31 14:56:10 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-31 14:56:10 -0400 |
| commit | 6318e53fb1dc8e60952427170cf0c16b86c20276 (patch) | |
| tree | 51ecd8c930727f3dbb242f51f4c074cf77fc83b7 /doc/design/adjusted_branches.mdwn | |
| parent | cd92a8bca739998bb70b5a131181c7eb52980ffe (diff) | |
made some progress on syncing adjusted branches, but still buggy
Diffstat (limited to 'doc/design/adjusted_branches.mdwn')
| -rw-r--r-- | doc/design/adjusted_branches.mdwn | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn index 6bc55a177..4d5e40929 100644 --- a/doc/design/adjusted_branches.mdwn +++ b/doc/design/adjusted_branches.mdwn @@ -171,7 +171,7 @@ adjust that commit so it does not have adjusted/master as its parent. |--------------->B'' | | -Finally, update master, by reverse filtering B''. TODO +Finally, update master, by reverse filtering B''. Notice how similar this is to the commit graph. So, "fast-forward" merging the same B commit from origin/master will lead to an identical @@ -301,3 +301,22 @@ into adjusted view worktrees.] * Interface in webapp to enable adjustments. * Upgrade from direct mode to v6 in unlocked branch. * Honor annex.thin when entering an adjusted branch. +* Cloning a repo that has an adjusted branch checked out gets into an ugly + state. + +Bug running git-annex sync in adjusted branch when there is a local change +that gets committed (or already has been), and remote changes available. +Both propigateAdjustedCommits and updateAdjustedBranch +get called in this scenario. Neither order of calling the two works entirely. + +The reflog has: + +d585d7f HEAD@{1}: rebasing adjusted branch on top of updated original branch +e51daec HEAD@{2}: merge f7f2b9f3b1d1c97a1ab24f4a94d4a27d84898992: Merge made by the 'recursive' strategy. +9504e7b HEAD@{3}: rebasing adjusted branch on top of updated original branch +6c6fd41 HEAD@{4}: commit: add + +e51daec has ok correct history; it gets messed up in d585d7f + +Problem is just, that the commit made to the adjusted branch +is left out of the history. |