Mercurial > evolve

comparison README @ 932:bcd0c12070b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sun, 11 May 2014 01:29:11 -0700
parents ec4c17e0aee6 32915143d448
children 43cceb37324c
comparison
equal deleted inserted replaced
922:ec4c17e0aee6 932:bcd0c12070b2
27 27
28 Contribute 28 Contribute
29 ========== 29 ==========
30 30
31 The simplest way to contribute is to issue a pull request on Bitbucket 31 The simplest way to contribute is to issue a pull request on Bitbucket
32 (https://bitbucket.org/marmoute/mutable-history). 32 (https://bitbucket.org/marmoute/mutable-history). Please don't forget
33 to update and run the tests when you fix a bug or add a feature. To
34 run the tests:
35
36 cd tests
37 python run-tests.py --with-hg=/path/to/hg
33 38
34 However, some cutting-edge changes may be found in a mutable repository hosted 39 However, some cutting-edge changes may be found in a mutable repository hosted
35 by logilab before they are published. 40 by logilab before they are published.
36 41
37 http://hg-lab.logilab.org/wip/mutable-history/ 42 http://hg-lab.logilab.org/wip/mutable-history/
60 - added progress when pulling obsmarkers 65 - added progress when pulling obsmarkers
61 - only pull markers relevant to pulled subset 66 - only pull markers relevant to pulled subset
62 - avoid exchanging common markers in some case 67 - avoid exchanging common markers in some case
63 - add a hook related to the new commands 68 - add a hook related to the new commands
64 69
70 3.3.2 --
71
72 - fix a bug where evolve were creating changeset with 2 parents on windows
73 (fix issues #16, #35 and #42)
74 - adds a --obsolete flag to import (requieres Mercurial 3.0)
75 - prune: update to successor rather than parent when pruning '.' with -s
76
65 3.3.1 -- 2014-04-23 77 3.3.1 -- 2014-04-23
66 78
67 - various language fix 79 - various language fix
68 - active bookmark now move when using prev/next (#37) 80 - active bookmark now move when using prev/next (#37)
69 - fix some preservation of rename information on evolve (#33) 81 - fix some preservation of rename information on evolve (#33)
70 - abort when evolve tries to move a node on top of itself (will helps on the #35 front) 82 - abort when evolve tries to move a node on top of itself (will helps on the #35 front)
71 - fold: enable --date and --user options 83 - fold: enable --date and --user options
72 84
73 3.3.0 -- 2014-03-04 85 3.3.0 -- 2014-03-04
74 86
87 <<<<<<< local: 1205:ec4c17e0aee6 (default)
88 ======= base: 1196:fc04758ea9f5 3.3.1 (stable)
89 - drop `latercomer` and `conflicting` compatibility. Those old alias are
90 deprecated for a long time now.
91 =======
92 - raise Mercurial's minimal requirement to 2.7
93 - drop `latercomer` and `conflicting` compatibility. Those old alias are
94 deprecated for a long time now.
95 >>>>>>> other: 1240:32915143d448 tip @ (stable)
75 - add verbose hint about how to handle corner case by hand. 96 - add verbose hint about how to handle corner case by hand.
76 This should help people until evolve is able to to it itself. 97 This should help people until evolve is able to to it itself.
77 - removed the qsync extension. The only user I knew about (logilab) is not 98 - removed the qsync extension. The only user I knew about (logilab) is not
78 using it anymore. It not compatible with coming Mercurial version 2.9. 99 using it anymore. It not compatible with coming Mercurial version 2.9.
79 - add progress indicator for long evolve command 100 - add progress indicator for long evolve command