##// END OF EJS Templates
revlog-compression: release note entry for update the config to be a list...
marmoute -
r44875:a6fb134b default
parent child Browse files
Show More
@@ -1,52 +1,61 b''
1 == New Features ==
1 == New Features ==
2
2
3 * `hg purge`/`hg clean` can now delete ignored files instead of
3 * `hg purge`/`hg clean` can now delete ignored files instead of
4 untracked files, with the new -i flag.
4 untracked files, with the new -i flag.
5
5
6 * `hg log` now defaults to using an '%' symbol for commits involved
6 * `hg log` now defaults to using an '%' symbol for commits involved
7 in unresolved merge conflicts. That includes unresolved conflicts
7 in unresolved merge conflicts. That includes unresolved conflicts
8 caused by e.g. `hg update --merge` and `hg graft`. '@' still takes
8 caused by e.g. `hg update --merge` and `hg graft`. '@' still takes
9 precedence, so what used to be marked '@' still is.
9 precedence, so what used to be marked '@' still is.
10
10
11 * New `conflictlocal()` and `conflictother()` revsets return the
11 * New `conflictlocal()` and `conflictother()` revsets return the
12 commits that are being merged, when there are conflicts. Also works
12 commits that are being merged, when there are conflicts. Also works
13 for conflicts caused by e.g. `hg graft`.
13 for conflicts caused by e.g. `hg graft`.
14
14
15 * `hg copy --forget` can be used to unmark a file as copied.
15 * `hg copy --forget` can be used to unmark a file as copied.
16
16
17 * The `format.revlog-compression` configuration entry now accept a list. The
18 first available option will be used. for example setting::
19
20 [format]
21 revlog-compression=zstd, zlib
22
23 Will use `zstd` compression for new repositories is available, and will
24 simply fall back to `zlib` if not.
25
17 == New Experimental Features ==
26 == New Experimental Features ==
18
27
19 * `hg copy` now supports a `--at-rev` argument to mark files as
28 * `hg copy` now supports a `--at-rev` argument to mark files as
20 copied in the specified commit. It only works with `--after` for
29 copied in the specified commit. It only works with `--after` for
21 now (i.e., it's only useful for marking files copied using non-hg
30 now (i.e., it's only useful for marking files copied using non-hg
22 `cp` as copied).
31 `cp` as copied).
23
32
24 * Use `hg copy --forget --at-rev REV` to unmark already committed
33 * Use `hg copy --forget --at-rev REV` to unmark already committed
25 copies.
34 copies.
26
35
27 * prevent pushes of divergent bookmarks (foo@remote)
36 * prevent pushes of divergent bookmarks (foo@remote)
28
37
29 == Bug Fixes ==
38 == Bug Fixes ==
30
39
31 * Fix server exception when concurrent pushes delete the same bookmark
40 * Fix server exception when concurrent pushes delete the same bookmark
32
41
33 == Backwards Compatibility Changes ==
42 == Backwards Compatibility Changes ==
34
43
35 * When `hg rebase` pauses for merge conflict resolution, the working
44 * When `hg rebase` pauses for merge conflict resolution, the working
36 copy will no longer have the rebased node as a second parent. You
45 copy will no longer have the rebased node as a second parent. You
37 can use the new `conflictparents()` revset for finding the other
46 can use the new `conflictparents()` revset for finding the other
38 parent during a conflict.
47 parent during a conflict.
39
48
40 * `hg recover` does not verify the validity of the whole repository
49 * `hg recover` does not verify the validity of the whole repository
41 anymore. You can pass `--verify` or call `hg verify` if necessary.
50 anymore. You can pass `--verify` or call `hg verify` if necessary.
42
51
43 == Internal API Changes ==
52 == Internal API Changes ==
44
53
45 * The deprecated `ui.progress()` has now been deleted. Please use
54 * The deprecated `ui.progress()` has now been deleted. Please use
46 `ui.makeprogress()` instead.
55 `ui.makeprogress()` instead.
47
56
48 * `hg.merge()` has lost its `abort` argument. Please call
57 * `hg.merge()` has lost its `abort` argument. Please call
49 `hg.abortmerge()` directly instead.
58 `hg.abortmerge()` directly instead.
50
59
51 * The `*others` argument of `cmdutil.check_incompatible_arguments()`
60 * The `*others` argument of `cmdutil.check_incompatible_arguments()`
52 changed from being varargs argument to being a single collection.
61 changed from being varargs argument to being a single collection.
General Comments 0
You need to be logged in to leave comments. Login now