Mercurial > hg
comparison relnotes/5.4 @ 44827:f445a4f7e8a7 stable
relnotes: copy "next" to "5.4" and clear "next"
This is the same thing as we've done for the previous few releases.
Differential Revision: https://phab.mercurial-scm.org/D8546
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 18 May 2020 08:31:32 -0700 |
parents | relnotes/next@f63598aa1c4b |
children |
comparison
equal
deleted
inserted
replaced
44826:35b255e474d9 | 44827:f445a4f7e8a7 |
---|---|
1 == New Features == | |
2 | |
3 * `hg purge`/`hg clean` can now delete ignored files instead of | |
4 untracked files, with the new -i flag. | |
5 | |
6 * `hg pull` now has a `--confirm` flag to prompt before applying changes. | |
7 Config option `pull.confirm` is also added for that. | |
8 | |
9 * `hg log` now defaults to using an '%' symbol for commits involved | |
10 in unresolved merge conflicts. That includes unresolved conflicts | |
11 caused by e.g. `hg update --merge` and `hg graft`. '@' still takes | |
12 precedence, so what used to be marked '@' still is. | |
13 | |
14 * New `conflictlocal()` and `conflictother()` revsets return the | |
15 commits that are being merged, when there are conflicts. Also works | |
16 for conflicts caused by e.g. `hg graft`. | |
17 | |
18 * `hg copy --forget` can be used to unmark a file as copied. | |
19 | |
20 * The `format.revlog-compression` configuration entry now accept a list. The | |
21 first available option will be used. for example setting:: | |
22 | |
23 [format] | |
24 revlog-compression=zstd, zlib | |
25 | |
26 Will use `zstd` compression for new repositories is available, and will | |
27 simply fall back to `zlib` if not. | |
28 | |
29 * `hg debugmergestate` output is now templated, which may be useful | |
30 e.g. for IDEs that want to help the user resolve merge conflicts. | |
31 | |
32 | |
33 == New Experimental Features == | |
34 | |
35 * `hg copy` now supports a `--at-rev` argument to mark files as | |
36 copied in the specified commit. It only works with `--after` for | |
37 now (i.e., it's only useful for marking files copied using non-hg | |
38 `cp` as copied). | |
39 | |
40 * Use `hg copy --forget --at-rev REV` to unmark already committed | |
41 copies. | |
42 | |
43 == Bug Fixes == | |
44 | |
45 * Fix server exception when concurrent pushes delete the same bookmark | |
46 | |
47 * Prevent pushes of divergent bookmarks (foo@remote) | |
48 | |
49 * The push error "remote repository changed while pushing - please | |
50 try again" now only happens when a concurrent push changed related | |
51 heads (instead of when a concurrent pushed any revision). | |
52 | |
53 | |
54 == Backwards Compatibility Changes == | |
55 | |
56 * When `hg rebase` pauses for merge conflict resolution, the working | |
57 copy will no longer have the rebased node as a second parent. You | |
58 can use the new `conflictparents()` revset for finding the other | |
59 parent during a conflict. | |
60 | |
61 * `hg rebase` now accepts repeated `--source` and `--base` | |
62 arguments. For example, `hg rebase --source 'A + B'` is equivalent | |
63 to `hg rebase --source A --source B`. This is a | |
64 backwards-incompatible change because it will break overriding an | |
65 alias `myrebase = rebase --source A` by `hg myrebase --source B` | |
66 (it will now rebase `(A + B)::` instead of `B::`). | |
67 | |
68 * `hg recover` does not verify the validity of the whole repository | |
69 anymore. You can pass `--verify` or call `hg verify` if necessary. | |
70 | |
71 * `hg debugmergestate` output format changed. Let us know if that is | |
72 causing you problems and we'll roll it back. | |
73 | |
74 * Resolved merge conflicts are now cleared by `hg commit` even if the | |
75 working copy has no changes. | |
76 | |
77 | |
78 == Internal API Changes == | |
79 | |
80 * The deprecated `ui.progress()` has now been deleted. Please use | |
81 `ui.makeprogress()` instead. | |
82 | |
83 * `hg.merge()` now takes a `ctx` instead of the previous `repo` and | |
84 `node` arguments. | |
85 | |
86 * `hg.merge()` has lost its `abort` argument. Please call | |
87 `hg.abortmerge()` directly instead. | |
88 | |
89 * `hg.merge()` has lost its `mergeforce` argument. It should have | |
90 only ever been called with the same value as the `force` argument. | |
91 | |
92 * The `*others` argument of `cmdutil.check_incompatible_arguments()` | |
93 changed from being varargs argument to being a single collection. |