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