upstream/mercurial-mirror Commit - r44876:efd73cdc

1

== New Features ==

1

== New Features ==

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

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

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

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

17

* The `format.revlog-compression` configuration entry now accept a list. The

17

* The `format.revlog-compression` configuration entry now accept a list. The

18

first available option will be used. for example setting::

18

first available option will be used. for example setting::

19

20

[format]

20

[format]

21

revlog-compression=zstd, zlib

21

revlog-compression=zstd, zlib

22

23

Will use `zstd` compression for new repositories is available, and will

23

Will use `zstd` compression for new repositories is available, and will

24

simply fall back to `zlib` if not.

24

simply fall back to `zlib` if not.

25

26

== New Experimental Features ==

26

== New Experimental Features ==

27

28

* `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

29

copied in the specified commit. It only works with `--after` for

29

copied in the specified commit. It only works with `--after` for

30

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

31

`cp` as copied).

31

`cp` as copied).

32

33

* Use `hg copy --forget --at-rev REV` to unmark already committed

33

* Use `hg copy --forget --at-rev REV` to unmark already committed

34

copies.

34

copies.

35

36

* prevent pushes of divergent bookmarks (foo@remote)

37

38

== Bug Fixes ==

36

== Bug Fixes ==

39

37

40

* Fix server exception when concurrent pushes delete the same bookmark

38

* Fix server exception when concurrent pushes delete the same bookmark

41

39

40

* Prevent pushes of divergent bookmarks (foo@remote)

41

42

== Backwards Compatibility Changes ==

42

== Backwards Compatibility Changes ==

43

44

* When `hg rebase` pauses for merge conflict resolution, the working

44

* When `hg rebase` pauses for merge conflict resolution, the working

45

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

46

can use the new `conflictparents()` revset for finding the other

46

can use the new `conflictparents()` revset for finding the other

47

parent during a conflict.

47

parent during a conflict.

48

49

* `hg recover` does not verify the validity of the whole repository

49

* `hg recover` does not verify the validity of the whole repository

50

anymore. You can pass `--verify` or call `hg verify` if necessary.

50

anymore. You can pass `--verify` or call `hg verify` if necessary.

51

52

== Internal API Changes ==

52

== Internal API Changes ==

53

54

* The deprecated `ui.progress()` has now been deleted. Please use

54

* The deprecated `ui.progress()` has now been deleted. Please use

55

`ui.makeprogress()` instead.

55

`ui.makeprogress()` instead.

56

57

* `hg.merge()` has lost its `abort` argument. Please call

57

* `hg.merge()` has lost its `abort` argument. Please call

58

`hg.abortmerge()` directly instead.

58

`hg.abortmerge()` directly instead.

59

60

* The `*others` argument of `cmdutil.check_incompatible_arguments()`

60

* The `*others` argument of `cmdutil.check_incompatible_arguments()`

61

changed from being varargs argument to being a single collection.

61

changed from being varargs argument to being a single collection.

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             == New Features ==
              * `hg purge`/`hg clean` can now delete ignored files instead of
                untracked files, with the new -i flag.
              * `hg log` now defaults to using an '%' symbol for commits involved
                 in unresolved merge conflicts. That includes unresolved conflicts
                 caused by e.g. `hg update --merge` and `hg graft`. '@' still takes
                 precedence, so what used to be marked '@' still is.
              * New `conflictlocal()` and `conflictother()` revsets return the
                commits that are being merged, when there are conflicts. Also works
                for conflicts caused by e.g. `hg graft`.
              * `hg copy --forget` can be used to unmark a file as copied.
              * The `format.revlog-compression` configuration entry now accept a list. The
                first available option will be used. for example setting::
                  [format]
                  revlog-compression=zstd, zlib
                Will use `zstd` compression for new repositories is available, and will
                simply fall back to `zlib` if not.
             == New Experimental Features ==
              * `hg copy` now supports a `--at-rev` argument to mark files as
                copied in the specified commit. It only works with `--after` for
                now (i.e., it's only useful for marking files copied using non-hg
                `cp` as copied).
              * Use `hg copy --forget --at-rev REV` to unmark already committed
                copies.
-             * prevent pushes of divergent bookmarks (foo@remote)
             == Bug Fixes  ==
              * Fix server exception when concurrent pushes delete the same bookmark
+             * Prevent pushes of divergent bookmarks (foo@remote)
             == Backwards Compatibility Changes ==
              * When `hg rebase` pauses for merge conflict resolution, the working
                copy will no longer have the rebased node as a second parent. You
                can use the new `conflictparents()` revset for finding the other
                parent during a conflict.
              * `hg recover` does not verify the validity of the whole repository
                anymore. You can pass `--verify` or call `hg verify` if necessary.
             == Internal API Changes ==
              * The deprecated `ui.progress()` has now been deleted. Please use
                `ui.makeprogress()` instead.
              * `hg.merge()` has lost its `abort` argument. Please call
                `hg.abortmerge()` directly instead.
              * The `*others` argument of `cmdutil.check_incompatible_arguments()`
                changed from being varargs argument to being a single collection.