CHANGELOG
branchmercurial-5.0
changeset 4779 85a97f37c78f
parent 4763 184c64c81528
parent 4729 076b6813a7ea
child 4786 83d0bed86ced
equal deleted inserted replaced
4778:1340d6718a88 4779:85a97f37c78f
    17 -------------------
    17 -------------------
    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   * prune: spell --successor flag without any unnecessary shortcuts
    22   * evolve: properly prune changeset with no change in case of conflict (issue5967)
    23   * evolve: properly prune changeset with no change in case of conflict (issue5967)
    23   * touch: detect resulting divergence in more cases (issue6107)
    24   * touch: detect resulting divergence in more cases (issue6107)
    24 
    25 
    25 9.0.0 -- 2019-06-06
    26 9.0.0 -- 2019-06-06
    26 -------------------
    27 -------------------