Mercurial > evolve
comparison README @ 1614:99077dbb83e0
merge with stable
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Thu, 11 Feb 2016 00:44:28 +0000 |
| parents | 5eedfe43e762 |
| children | 160968654581 |
comparison
equal
deleted
inserted
replaced
| 1598:2a08ef812b84 | 1614:99077dbb83e0 |
|---|---|
| 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.selenic.com/ | 31 Bugs are to be reported on the mercurial's bug tracker: http://bz.mercurial-scm.com/ |
| 32 Use the the "evolution" component. | 32 Use the the "evolution" component. |
| 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 |
| 38 hg email --to mercurial-devel@selenic.com --flag evolve-ext --rev '<your patches>' | 38 hg email --to mercurial-devel@mercurial-scm.org --flag evolve-ext --rev '<your patches>' |
| 39 | 39 |
| 40 See also | 40 See also |
| 41 http://mercurial.selenic.com/wiki/ContributingChanges#Patch_descriptions | 41 http://mercurial-scm.org/wiki/ContributingChanges#Patch_descriptions |
| 42 for guidelines on the patch description. | 42 for guidelines on the patch description. |
| 43 | 43 |
| 44 Please don't forget to update and run the tests when you fix a bug or | 44 Please don't forget to update and run the tests when you fix a bug or |
| 45 add a feature. To run the tests, you need a working copy of Mercurial, | 45 add a feature. To run the tests, you need a working copy of Mercurial, |
| 46 say in $HGSRC: | 46 say in $HGSRC: |
| 54 | 54 |
| 55 | 55 |
| 56 Changelog | 56 Changelog |
| 57 ========= | 57 ========= |
| 58 | 58 |
| 59 5.3.0 -- | 59 5.3.0 -- 2016-02-11 |
| 60 | 60 |
| 61 - split: add a new command to split changesets, | 61 - split: add a new command to split changesets, |
| 62 - tests: drop our copy of 'run-tests.py' use core one instead, | 62 - tests: drop our copy of 'run-tests.py' use core one instead, |
| 63 - bookmark: do all bookmark movement within a transaction. | 63 - bookmark: do all bookmark movement within a transaction. |
| 64 - evolve: compatibility with Mercurial 3.7 | 64 - evolve: compatibility with Mercurial 3.7 |
| 65 - evolve: support merge with a single obsolete parent. | 65 - 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) | 66 - evolve: prevent added file to be marked as unknown if evolve fails (issue4966) |
| 67 - evolve: stop relying on graftstate file for save evolve state | 67 - evolve: stop relying on graftstate file for save evolve state |
| 68 (for `hg evolve --continue`) | 68 (for `hg evolve --continue`) |
| 69 | 69 - evolve: fix divergence resolution when it result in an empty commit |
| 70 5.2.2 -- | 70 (issue4950) (hg-3.5+ only) |
| 71 | |
| 72 - no longer lock the repository for `hg parents` (issue4895) | 71 - no longer lock the repository for `hg parents` (issue4895) |
| 73 - updated help for the `evolve` command | 72 - updated help for the `evolve` command |
| 74 | 73 |
| 75 5.2.1 -- 2015-11-02 | 74 5.2.1 -- 2015-11-02 |
| 76 | 75 |