Skip to content
  • Sushil Khanchi's avatar
    touch: fix the inconsistent behavior of divergence catching logic (issue6107) · ef8907df73fc
    Sushil Khanchi authored
    When touching a node, the way we check if it can lead to divergence
    is we look at the successors sets of the rev being touched. And if
    there is successor revs exists (excluding the case when that successor
    set is (A,) for rev A) that means there will be divergence and we warn
    the user.
    This works fine but there is still a case (which is not covered by looking
    at successor sets) which can lead to divergence.
    
    That case is: when there is already a revision exists which is divergent
    to the revision being touched. And performing the touch would revive
    that "dead" divergence. (Dead because one of the revision is obsolete which
    is the one we are touching)
    
    And to see if there is any rev which is divergent to a particular rev
    we already have a function which we can use here
    i.e. `evolvecmd.divergentsets(repo, ctx_being_touched)`
    
    Changes in test file demonstrate the fixed behaviour.
    ef8907df73fc
To find the state of this project's repository at the time of any of these versions, check out the tags.