14 **This extension is experimental and not yet meant for production.** |
14 **This extension is experimental and not yet meant for production.** |
15 |
15 |
16 You can enable it by adding the line below to the ``extensions`` |
16 You can enable it by adding the line below to the ``extensions`` |
17 section of your hgrc:: |
17 section of your hgrc:: |
18 |
18 |
19 evolve = PATH/TO/mutable-history/hgext/evolve.py |
19 evolve = PATH/TO/evolve-main/hgext/evolve.py |
20 |
20 |
21 We recommend reading the documentation first. An online version is |
21 We recommend reading the documentation first. An online version is |
22 available here: |
22 available here: |
23 |
23 |
24 http://evolution.experimentalworks.net/doc/ |
24 https://www.mercurial-scm.org/doc/evolution/ |
25 |
25 |
26 Or see the ``doc/`` directory for a local copy. |
26 Or see the ``doc/`` directory for a local copy. |
27 |
27 |
28 Contribute |
28 Contribute |
29 ========== |
29 ========== |
30 |
30 |
31 Bugs are to be reported on the mercurial's bug tracker: http://bz.mercurial-scm.com/ |
31 Bugs are to be reported on the mercurial's bug tracker (component: evolution): |
32 Use the the "evolution" component. |
32 https://bz.mercurial-scm.org/buglist.cgi?component=evolution&query_format=advanced&resolution=--- |
33 |
33 |
34 Please use the patchbomb extension to send email to mercurial devel. Please |
34 Please use the patchbomb extension to send email to mercurial devel. Please |
35 make sure to use the evolve-ext flag when doing so. You can use a command like |
35 make sure to use the evolve-ext flag when doing so. You can use a command like |
36 this: |
36 this: |
37 |
37 |
54 |
54 |
55 |
55 |
56 Changelog |
56 Changelog |
57 ========= |
57 ========= |
58 |
58 |
59 5.3.0 -- |
59 5.4.0 -- |
|
60 |
|
61 - Some collaboration with the topic experimental extensions, |
|
62 - hg evolve --all with consider all troubles in your current topic, |
|
63 - preserve 'topic' during evolve, |
|
64 - 'next' and 'prev' restrict themself to the current topic by default, |
|
65 - remove the dangerous 'kill' alias for 'prune' (because 'hg kill -1' without |
|
66 the leading 'hg' will give you an hardtime) |
|
67 - during 'hg evolve' skip unsupported merge instead of aborting |
|
68 - various documentation fix and update |
|
69 - hg summary now suggest 'hg evolve --continue when appropriate` |
|
70 - compatibility with Mercurial 3.8 'hgext' namespace package. |
|
71 - small improvement to the `hg split` instruction |
|
72 - add a 'metaedit' command to rewrite changeset meta data. |
|
73 |
|
74 5.3.0 -- 2016-02-11 |
60 |
75 |
61 - split: add a new command to split changesets, |
76 - split: add a new command to split changesets, |
62 - tests: drop our copy of 'run-tests.py' use core one instead, |
77 - tests: drop our copy of 'run-tests.py' use core one instead, |
63 - bookmark: do all bookmark movement within a transaction. |
78 - bookmark: do all bookmark movement within a transaction. |
64 - evolve: compatibility with Mercurial 3.7 |
79 - evolve: compatibility with Mercurial 3.7 |
65 - evolve: support merge with a single obsolete parent. |
80 - evolve: support merge with a single obsolete parent (hg-3.7+ only) |
66 - evolve: prevent added file to be marked as unknown if evolve fails (issue4966) |
81 - evolve: prevent added file to be marked as unknown if evolve fails (issue4966) |
67 - evolve: stop relying on graftstate file for save evolve state |
82 - evolve: stop relying on graftstate file for save evolve state |
68 (for `hg evolve --continue`) |
83 (for `hg evolve --continue`) |
69 |
84 - evolve: fix divergence resolution when it result in an empty commit |
70 5.2.2 -- |
85 (issue4950) (hg-3.5+ only) |
71 |
|
72 - no longer lock the repository for `hg parents` (issue4895) |
86 - no longer lock the repository for `hg parents` (issue4895) |
73 - updated help for the `evolve` command |
87 - updated help for the `evolve` command |
74 |
88 |
75 5.2.1 -- 2015-11-02 |
89 5.2.1 -- 2015-11-02 |
76 |
90 |
93 - evolve: `hg evolve --all` only evolve changeset that will end up as |
107 - evolve: `hg evolve --all` only evolve changeset that will end up as |
94 descendant of the current working copy. The old behavior of `--all` |
108 descendant of the current working copy. The old behavior of `--all` |
95 in now in `--all --any`. |
109 in now in `--all --any`. |
96 - evolve: add a 'experimental.evolutioncommands' for fine grained commands |
110 - evolve: add a 'experimental.evolutioncommands' for fine grained commands |
97 enabling |
111 enabling |
98 - next/prev: requires `--merge` to move with uncommited changes |
112 - next/prev: requires `--merge` to move with uncommitted changes |
99 - next: significantly reword error messages |
113 - next: significantly reword error messages |
100 - next: add a --evolve flag to evolve aspiring children when on a head |
114 - next: add a --evolve flag to evolve aspiring children when on a head |
101 |
115 |
102 5.1.5 -- 2015-06-23 |
116 5.1.5 -- 2015-06-23 |
103 |
117 |