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

devblog

Browse source
This commit is contained in:
Joey Hess 2016-03-31 19:06:30 -04:00
parent ed3e8e1886
commit 92db17e16f
Failed to extract signature
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
doc/devblog/day_376__in_the_weeds.mdwn Normal file
View file

@ -0,0 +1,18 @@
Spent all day fixing sync in adjusted branches. I was lost in the weeds for
a long time. Eventually, drawing this diagram helped me find my way
to a solution:
origin/master adjusted/master master
A A
|--------------->A' |
| | |
| C'- - - - - - - - > C
B |
| |
|--------------->M'<-----------------|
After implementing that, syncing in adjusted branches seems to work much
better now. And I've finally merged support for them into master.
There's still several bugs and race conditions and upgrade things to sort
out around adjusted branches. Proably another week's work all told.