Skip to content
Snippets Groups Projects
Commit 26c51e87 authored by Sean Farley's avatar Sean Farley
Browse files

bookmarks: resolve divergent bookmarks when fowarding bookmark to descendant

This patch is a follow-up to 56dd55da2f7d that resolves divergent bookmarks
between the to-be-forwarded bookmark MARK and the new descendant. This
situation can happen when pulling new changesets, updating to the divergent
bookmark, abandoning the previous changesets with strip, and then moving MARK
to MARK@N.

Test coverage is added.
parent cb95716d
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment