relnotes/next
branchstable
changeset 48804 f0081a551f37
parent 48669 7ee07e1a25c0
child 49423 a974c52fb79a
equal deleted inserted replaced
48803:60950aef856c 48804:f0081a551f37
       
     1 = Mercurial XXX =
       
     2 
     1 == New Features ==
     3 == New Features ==
     2 
       
     3 
     4 
     4 == Default Format Change ==
     5 == Default Format Change ==
     5 
     6 
     6 These changes affects newly created repositories (or new clone) done with
     7 These changes affect newly created repositories (or new clones) done with
     7 Mercurial 6.1.
     8 Mercurial XXX.
     8 
       
     9 The `share-safe` format variant is now enabled by default. It makes
       
    10 configuration and requirements more consistent across repository and their
       
    11 shares. This introduces a behavior change as shares from a repository using the
       
    12 new format will also use their main repository's configuration.
       
    13 
       
    14 See `hg help config.format.use-share-safe` for details about the feature and
       
    15 the available options for auto-upgrading existing shares.
       
    16 
       
    17 
     9 
    18 == New Experimental Features ==
    10 == New Experimental Features ==
    19 
    11 
    20 == Bug Fixes ==
    12 == Bug Fixes ==
    21 
    13 
    22 The `--no-check` and `--no-merge` now properly overwrite the behavior from `commands.update.check`.
       
    23 
       
    24 == Backwards Compatibility Changes ==
    14 == Backwards Compatibility Changes ==
    25 
       
    26 The remotefilelog extension now requires an appropiate excludepattern
       
    27 for subrepositories.
       
    28 
       
    29 The labels passed to merge tools have changed slightly. Merge tools can get
       
    30 labels passed to them if you include `$labellocal`, `$labelbase`, and/or
       
    31 `$labelother` in the `merge-tool.<tool name>.args` configuration. These labels
       
    32 used to have some space-padding, and truncation to fit within 72 columns. Both
       
    33 the padding and the truncation has been removed.
       
    34 
       
    35 Some of the text in labels passed to merge tools has changed. For example,
       
    36 in conflicts while running `hg histedit`, the labels used to be "local",
       
    37 "base", and "histedit". They are now "already edited",
       
    38 "parent of current change", and "current change", respectively.
       
    39 
       
    40 The use of `share-safe`, means shares (of new repositories) will also use their
       
    41 main repository's configuration see the `Default Format Change` section
       
    42 for details.
       
    43 
    15 
    44 == Internal API Changes ==
    16 == Internal API Changes ==
    45 
    17 
    46 The following functions have been removed:
    18 == Miscellaneous ==
    47 
       
    48 Miscellaneous: