[MER-2352] Make branch adoption work #121
Conversation
Current Aviator status
This PR was merged using Aviator. |
| @@ -34,6 +34,24 @@ func Reparent( | |||
| tx meta.WriteTx, | |||
| opts ReparentOpts, | |||
| ) (*ReparentResult, error) { | |||
| branchMeta, exist := tx.Branch(opts.Branch) | |||
| if !exist { | |||
There was a problem hiding this comment.
so this was not working previously if the current branch was not part of any existing stack?
There was a problem hiding this comment.
Nope. That's why I added a test.
draftcode
force-pushed
the
fix_branch_adoption
branch
2 times, most recently
from
8abc3af
to
5cb01ac
Compare
| } | ||
| branchMeta.Parent.Head = head | ||
| } | ||
| tx.SetBranch(branchMeta) |
There was a problem hiding this comment.
I don't think we need to do this SetBranch here.
I think it's effectively a no-op right now because we do the SetBranch in reparentWriteMetadata which is called on every code path (unless there's a conflict... is that an issue? 🙃).
At any rate, I think this is fine (as in it ~~works~~) but it's a little hard to follow.
draftcode
force-pushed
the
fix_branch_adoption
branch
from
5cb01ac
to
f516be7
Compare
draftcode
changed the title
Close #120.