CHANGELOG
branchstable
changeset 4728 ef8907df73fc
parent 4702 fcecbb1261f2
child 4729 076b6813a7ea
child 4763 184c64c81528
equal deleted inserted replaced
4727:355b8e17e14c 4728:ef8907df73fc
     6 
     6 
     7   * pick: no longer forget file in case of conflict (issue6037)
     7   * pick: no longer forget file in case of conflict (issue6037)
     8   * pick: properly report and cleanup "unfinished state"
     8   * pick: properly report and cleanup "unfinished state"
     9   * prune: don't update wcp if pruned revision are unrelated (issue6137)
     9   * prune: don't update wcp if pruned revision are unrelated (issue6137)
    10   * evolve: properly prune changeset with no change in case of conflict (issue5967)
    10   * evolve: properly prune changeset with no change in case of conflict (issue5967)
       
    11   * touch: detect resulting divergence in more cases (issue6107)
    11 
    12 
    12 9.0.0 -- 2019-06-06
    13 9.0.0 -- 2019-06-06
    13 -------------------
    14 -------------------
    14 
    15 
    15   * evolve: preserve the working directory after resolving instability (BC)
    16   * evolve: preserve the working directory after resolving instability (BC)