CHANGELOG
changeset 4729 076b6813a7ea
parent 4724 77bf84025dd5
parent 4728 ef8907df73fc
child 4774 12a88b988875
equal deleted inserted replaced
4725:f162cafc5000 4729:076b6813a7ea
    18 
    18 
    19   * pick: no longer forget file in case of conflict (issue6037)
    19   * pick: no longer forget file in case of conflict (issue6037)
    20   * pick: properly report and cleanup "unfinished state"
    20   * pick: properly report and cleanup "unfinished state"
    21   * prune: don't update wcp if pruned revision are unrelated (issue6137)
    21   * prune: don't update wcp if pruned revision are unrelated (issue6137)
    22   * evolve: properly prune changeset with no change in case of conflict (issue5967)
    22   * evolve: properly prune changeset with no change in case of conflict (issue5967)
       
    23   * touch: detect resulting divergence in more cases (issue6107)
    23 
    24 
    24 9.0.0 -- 2019-06-06
    25 9.0.0 -- 2019-06-06
    25 -------------------
    26 -------------------
    26 
    27 
    27   * evolve: preserve the working directory after resolving instability (BC)
    28   * evolve: preserve the working directory after resolving instability (BC)