Skip to content

Topic/default/spectral content divergent relocation

Kyle Lippincott requested to merge topic/default/spectral-content-divergent-relocation into branch/default

If users are not proactive about resolving content divergence prior to issuing other commands, such as rebase, the repository can be put into a state that resembles:

o commit2 [content-divergent]
|
o commit1 [content-divergent]
|
o base

And running hg evolve --content-divergent may attempt to relocate one of these commits to be a child of itself. If the relocation target would be ourself, just don't try to relocate.

Merge request reports