README
author Pierre-Yves David <pierre-yves.david@fb.com>
Fri, 08 Aug 2014 15:33:39 -0700
branchstable
changeset 1027 fe1505aa565b
parent 1010 b88412664251
child 1013 58ff9d9c0746
child 1028 fc2be6050312
permissions -rw-r--r--
evolve: update tested with statement
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
560
4580ff7157ae fix readme header
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 556
diff changeset
     1
=============================
33
dca86448d736 Add some doc.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
     2
Mutable History For Mercurial
dca86448d736 Add some doc.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
     3
=============================
dca86448d736 Add some doc.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
     4
739
dcda64966616 README: polish the language so it reads better
Greg Ward <greg@gerg.ca>
parents: 738
diff changeset
     5
This package supplies the ``evolve`` extension for Mercurial, which
dcda64966616 README: polish the language so it reads better
Greg Ward <greg@gerg.ca>
parents: 738
diff changeset
     6
provides several commands to mutate history and deal with the
dcda64966616 README: polish the language so it reads better
Greg Ward <greg@gerg.ca>
parents: 738
diff changeset
     7
resulting issues.
33
dca86448d736 Add some doc.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
     8
523
c9983eb6969c doc: long desc update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 487
diff changeset
     9
It also:
293
232990fbecb5 [doc] update readme
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 267
diff changeset
    10
738
d33fdd8202f3 README: fix spelling, capitalization, grammar, punctuation
Greg Ward <greg@gerg.ca>
parents: 737
diff changeset
    11
    - enables the "changeset obsolescence" feature of Mercurial
739
dcda64966616 README: polish the language so it reads better
Greg Ward <greg@gerg.ca>
parents: 738
diff changeset
    12
    - issues several warning messages when trouble appears in your repository
33
dca86448d736 Add some doc.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    13
739
dcda64966616 README: polish the language so it reads better
Greg Ward <greg@gerg.ca>
parents: 738
diff changeset
    14
**This extension is experimental and not yet meant for production.**
33
dca86448d736 Add some doc.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    15
739
dcda64966616 README: polish the language so it reads better
Greg Ward <greg@gerg.ca>
parents: 738
diff changeset
    16
You can enable it by adding the line below to the ``extensions``
738
d33fdd8202f3 README: fix spelling, capitalization, grammar, punctuation
Greg Ward <greg@gerg.ca>
parents: 737
diff changeset
    17
section of your hgrc::
324
ff070b9e22ef readme: explain "instalation process"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 293
diff changeset
    18
739
dcda64966616 README: polish the language so it reads better
Greg Ward <greg@gerg.ca>
parents: 738
diff changeset
    19
    evolve = PATH/TO/mutable-history/hgext/evolve.py
33
dca86448d736 Add some doc.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    20
739
dcda64966616 README: polish the language so it reads better
Greg Ward <greg@gerg.ca>
parents: 738
diff changeset
    21
We recommend reading the documentation first. An online version is
dcda64966616 README: polish the language so it reads better
Greg Ward <greg@gerg.ca>
parents: 738
diff changeset
    22
available here:
293
232990fbecb5 [doc] update readme
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 267
diff changeset
    23
1009
ef1a28184929 readme: update the official documentation location
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 970
diff changeset
    24
    http://evolution.experimentalworks.net/doc/
238
b5d9841defc8 more read me update
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 237
diff changeset
    25
739
dcda64966616 README: polish the language so it reads better
Greg Ward <greg@gerg.ca>
parents: 738
diff changeset
    26
Or see the ``doc/`` directory for a local copy.
dcda64966616 README: polish the language so it reads better
Greg Ward <greg@gerg.ca>
parents: 738
diff changeset
    27
238
b5d9841defc8 more read me update
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 237
diff changeset
    28
Contribute
737
c96dd66c6839 README: fix minor markup inconsistencies
Greg Ward <greg@gerg.ca>
parents: 717
diff changeset
    29
==========
238
b5d9841defc8 more read me update
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 237
diff changeset
    30
739
dcda64966616 README: polish the language so it reads better
Greg Ward <greg@gerg.ca>
parents: 738
diff changeset
    31
The simplest way to contribute is to issue a pull request on Bitbucket
926
14d91c36f88b README: document how to run the tests
Greg Ward <greg@gerg.ca>
parents: 924
diff changeset
    32
(https://bitbucket.org/marmoute/mutable-history). Please don't forget
14d91c36f88b README: document how to run the tests
Greg Ward <greg@gerg.ca>
parents: 924
diff changeset
    33
to update and run the tests when you fix a bug or add a feature. To
14d91c36f88b README: document how to run the tests
Greg Ward <greg@gerg.ca>
parents: 924
diff changeset
    34
run the tests:
14d91c36f88b README: document how to run the tests
Greg Ward <greg@gerg.ca>
parents: 924
diff changeset
    35
14d91c36f88b README: document how to run the tests
Greg Ward <greg@gerg.ca>
parents: 924
diff changeset
    36
    cd tests
14d91c36f88b README: document how to run the tests
Greg Ward <greg@gerg.ca>
parents: 924
diff changeset
    37
    python run-tests.py --with-hg=/path/to/hg
238
b5d9841defc8 more read me update
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 237
diff changeset
    38
738
d33fdd8202f3 README: fix spelling, capitalization, grammar, punctuation
Greg Ward <greg@gerg.ca>
parents: 737
diff changeset
    39
However, some cutting-edge changes may be found in a mutable repository hosted
267
34020ca0c451 README: some more changes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 261
diff changeset
    40
by logilab before they are published.
238
b5d9841defc8 more read me update
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 237
diff changeset
    41
1010
b88412664251 readme: update the work in progress repository location
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1009
diff changeset
    42
    http://hg.netv6.net/marmoute-wip/evolve/
238
b5d9841defc8 more read me update
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 237
diff changeset
    43
739
dcda64966616 README: polish the language so it reads better
Greg Ward <greg@gerg.ca>
parents: 738
diff changeset
    44
Be sure to check latest draft changeset before submitting new changesets.
261
240b37998806 added “pull here is OK, too” to the README.
Arne Babenhauserheide <bab@draketo.de>
parents: 239
diff changeset
    45
267
34020ca0c451 README: some more changes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 261
diff changeset
    46
325
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
    47
Changelog
737
c96dd66c6839 README: fix minor markup inconsistencies
Greg Ward <greg@gerg.ca>
parents: 717
diff changeset
    48
=========
325
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
    49
970
0304fc2bab15 pkg: prepare release of version 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 957
diff changeset
    50
4.0.0 -- 2014-06-03
921
b39bdae5189d readme: rephrase the changelog entry regarding the new exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 920
diff changeset
    51
952
f83f46411b09 evolve: bump requirement to 3.0.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 939
diff changeset
    52
- require Mercurial version 3.0.1 or above
955
72670e282460 evolve: compatibility with memfilectx change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 952
diff changeset
    53
- some compatibility fixes with future 3.1.0
922
ec4c17e0aee6 readme: update the readme with all missing entry
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 921
diff changeset
    54
- deprecated `gup` and `gdown` in favor of prev and next
ec4c17e0aee6 readme: update the readme with all missing entry
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 921
diff changeset
    55
- record parent of pruned parent at prune time
ec4c17e0aee6 readme: update the readme with all missing entry
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 921
diff changeset
    56
- added a `debugobsstorestat` command to gather data on obsmarker content.
ec4c17e0aee6 readme: update the readme with all missing entry
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 921
diff changeset
    57
- added a `debugrecordpruneparents` command to upgrade existing prune marker
ec4c17e0aee6 readme: update the readme with all missing entry
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 921
diff changeset
    58
  with parent information. Please run it once per repo after upgrading.
921
b39bdae5189d readme: rephrase the changelog entry regarding the new exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 920
diff changeset
    59
- improvement to obsolescence marker exchange:
b39bdae5189d readme: rephrase the changelog entry regarding the new exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 920
diff changeset
    60
  - added progress when pushing obsmarkers
b39bdae5189d readme: rephrase the changelog entry regarding the new exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 920
diff changeset
    61
  - added multiple output during obsolescence markers exchange
b39bdae5189d readme: rephrase the changelog entry regarding the new exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 920
diff changeset
    62
  - only push markers relevant to pushed subset
b39bdae5189d readme: rephrase the changelog entry regarding the new exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 920
diff changeset
    63
  - add a new experimental way to exchange marker (when server support):
b39bdae5189d readme: rephrase the changelog entry regarding the new exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 920
diff changeset
    64
    - added progress when pulling obsmarkers
b39bdae5189d readme: rephrase the changelog entry regarding the new exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 920
diff changeset
    65
    - only pull markers relevant to pulled subset
b39bdae5189d readme: rephrase the changelog entry regarding the new exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 920
diff changeset
    66
    - avoid exchanging common markers in some case
957
2cde59f3cb5d evolve: add a push pass using bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 955
diff changeset
    67
    - use bundle2 as transport when available.
922
ec4c17e0aee6 readme: update the readme with all missing entry
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 921
diff changeset
    68
 - add a hook related to the new commands
861
b6337585ae25 merged 3.3 release into default
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 804 859
diff changeset
    69
935
a03ea39aca2a prepare release 3.3.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 934
diff changeset
    70
3.3.2 -- 2014-05-14
924
a6a202c22b28 readme: the forgotten update strike again
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 917
diff changeset
    71
a6a202c22b28 readme: the forgotten update strike again
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 917
diff changeset
    72
- fix a bug where evolve were creating changeset with 2 parents on windows
a6a202c22b28 readme: the forgotten update strike again
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 917
diff changeset
    73
  (fix issues #16, #35 and #42)
930
cac35bef8aee import: --obsolete flag for automatic obsolescence marker creation
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 929
diff changeset
    74
- adds a --obsolete flag to import (requieres Mercurial 3.0)
931
32915143d448 prune: update to successor rather than parent when prune '.'
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 930
diff changeset
    75
- prune: update to successor rather than parent when pruning '.' with -s
933
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 931
diff changeset
    76
- fold: add missing --message and --logfile option
934
f13facb01ac5 fold: add squash as a possible alias
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 933
diff changeset
    77
- fold: add squash as an alias
924
a6a202c22b28 readme: the forgotten update strike again
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 917
diff changeset
    78
917
fc04758ea9f5 prepare release 3.3.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 915
diff changeset
    79
3.3.1 -- 2014-04-23
913
2a057f809d03 evolve: update changelog in README
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 859
diff changeset
    80
2a057f809d03 evolve: update changelog in README
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 859
diff changeset
    81
- various language fix
914
a0e7c38a9df0 evolve: improves readme wording
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 913
diff changeset
    82
- active bookmark now move when using prev/next (#37)
a0e7c38a9df0 evolve: improves readme wording
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 913
diff changeset
    83
- fix some preservation of rename information on evolve (#33)
a0e7c38a9df0 evolve: improves readme wording
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 913
diff changeset
    84
- abort when evolve tries to move a node on top of itself (will helps on the #35 front)
915
1ebe5c51919b fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 914
diff changeset
    85
- fold: enable --date and --user options
913
2a057f809d03 evolve: update changelog in README
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 859
diff changeset
    86
859
83882f2fbecb prepare 3.3.0 release
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 858
diff changeset
    87
3.3.0 -- 2014-03-04
760
bbb3a0e1dfea evolve: add more details when we abort for case not handled yet
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 753
diff changeset
    88
928
be39695cbfda update 3.3.0 readme to include minimal mercurial requirement
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 763
diff changeset
    89
- raise Mercurial's minimal requirement to 2.7
858
2137f1c153d6 evolve: drop `latercomer` and `conflicting` compatibility.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 763
diff changeset
    90
- drop `latercomer` and `conflicting` compatibility. Those old alias are
2137f1c153d6 evolve: drop `latercomer` and `conflicting` compatibility.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 763
diff changeset
    91
  deprecated for a long time now.
760
bbb3a0e1dfea evolve: add more details when we abort for case not handled yet
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 753
diff changeset
    92
- add verbose hint about how to handle corner case by hand.
bbb3a0e1dfea evolve: add more details when we abort for case not handled yet
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 753
diff changeset
    93
  This should help people until evolve is able to to it itself.
761
60a2fad03650 removed the qsync extension.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 760
diff changeset
    94
- removed the qsync extension. The only user I knew about (logilab) is not
60a2fad03650 removed the qsync extension.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 760
diff changeset
    95
  using it anymore. It not compatible with coming Mercurial version 2.9.
762
942aabaa8a8e evolve: show progress
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 761
diff changeset
    96
- add progress indicator for long evolve command
763
966e2659e989 import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 762
diff changeset
    97
- report troubles creation from `hg import`
760
bbb3a0e1dfea evolve: add more details when we abort for case not handled yet
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 753
diff changeset
    98
753
c3ba8a965a7a prepare 2.8 release
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 752
diff changeset
    99
3.2.0 -- 2013-11-15
744
72d7b0b9edd6 README: update changelog
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 717
diff changeset
   100
72d7b0b9edd6 README: update changelog
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 717
diff changeset
   101
- conform to the Mercurial custom of lowercase messages
72d7b0b9edd6 README: update changelog
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 717
diff changeset
   102
- added a small extension to experiment with obsolescence marker push
72d7b0b9edd6 README: update changelog
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 717
diff changeset
   103
- amend: drop the deprecated note option
72d7b0b9edd6 README: update changelog
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 717
diff changeset
   104
- amend: use core mechanism for amend (fix multiple bugs)
745
99e51aff724b add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 744
diff changeset
   105
- parents command: add "working directory parent is obsolete" message
750
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 746
diff changeset
   106
- evolve command: allow updating to the successor if the parent is
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 746
diff changeset
   107
  obsolete
751
a5474648a9d2 gdown/gup: add next/previous alias
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 750
diff changeset
   108
- gdown and gup commands: add next and previous alias, respectively
752
bfdfdf731f8a grab: update the alias for 2.8 compatibility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 751
diff changeset
   109
- make grab aliases compatible with Mercurial 2.8
753
c3ba8a965a7a prepare 2.8 release
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 752
diff changeset
   110
- Tested with 2.6, 2.7 and 2.8
744
72d7b0b9edd6 README: update changelog
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 717
diff changeset
   111
717
cdb52bbbe5b8 prepare release 3.1.0
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 716
diff changeset
   112
3.1.0 -- 2013-02-11
662
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 636
diff changeset
   113
698
b21437d19ea2 changelog: add more entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 697
diff changeset
   114
- amend: drop deprecated --change option for amend
b21437d19ea2 changelog: add more entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 697
diff changeset
   115
- alias: add a grab aliast to be used instead of graft -O
701
f752089479ce add a duplicate option in touch
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 698
diff changeset
   116
- touch: add a --duplicate option to *not* obsolete the old version
702
b5a85a8909d3 touch: properly handle touching multiple changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 701
diff changeset
   117
- touch: fix touching multiple revision at the same time
711
7d4427db811b evolve: document --all option
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 702
diff changeset
   118
- evolve: add a --all option
715
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 711
diff changeset
   119
- prune: various minor improvements
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 711
diff changeset
   120
- prune: add option to prune a specific bookmark
716
4c0f6d555032 prune: add --user and --date options
Levi Bard <levi@unity3d.com>
parents: 715
diff changeset
   121
- prune: add -u and -d option to control metadata
689
d48aae167b9d prune: documentation update
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 664
diff changeset
   122
d48aae167b9d prune: documentation update
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 664
diff changeset
   123
3.0.0 -- 2013-02-02
d48aae167b9d prune: documentation update
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 664
diff changeset
   124
662
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 636
diff changeset
   125
- compatibility with 2.5
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 636
diff changeset
   126
636
27c890b4f864 evolve: make evolve smarter
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 627
diff changeset
   127
2.2.0 --
27c890b4f864 evolve: make evolve smarter
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 627
diff changeset
   128
27c890b4f864 evolve: make evolve smarter
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 627
diff changeset
   129
- make evolve smarter at picking next troubled to solved without --any
27c890b4f864 evolve: make evolve smarter
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 627
diff changeset
   130
627
28d79c21cc3a update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 602
diff changeset
   131
2.1.0 -- 2012-12-03
28d79c21cc3a update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 602
diff changeset
   132
28d79c21cc3a update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 602
diff changeset
   133
- qsync fixes
28d79c21cc3a update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 602
diff changeset
   134
- have qfold ask for commit message
28d79c21cc3a update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 602
diff changeset
   135
28d79c21cc3a update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 602
diff changeset
   136
2.0.0 -- 2012-10-26
596
5527e4fe4418 merge changelog update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 595
diff changeset
   137
5527e4fe4418 merge changelog update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 595
diff changeset
   138
- compat with mercurial 2.4
5527e4fe4418 merge changelog update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 595
diff changeset
   139
597
d14f9c4ceaa7 prepares evolve 1.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 595
diff changeset
   140
1.1.0 -- 2012-10-26
571
31efc36f3aac rebase: warn about troubles created by rebase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 560
diff changeset
   141
31efc36f3aac rebase: warn about troubles created by rebase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 560
diff changeset
   142
- fix troubles creation reporting from rebase
595
96482166420c update changelog with future 1.1.0 news
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 571
diff changeset
   143
- rename latecomer to bumped
96482166420c update changelog with future 1.1.0 news
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 571
diff changeset
   144
- renamed conflicting to divergent
96482166420c update changelog with future 1.1.0 news
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 571
diff changeset
   145
- smarter divergent handling
571
31efc36f3aac rebase: warn about troubles created by rebase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 560
diff changeset
   146
597
d14f9c4ceaa7 prepares evolve 1.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 595
diff changeset
   147
1.0.2 -- 2012-09-19
555
3704751fa27f update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 541
diff changeset
   148
3704751fa27f update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 541
diff changeset
   149
- fix hg fold bug
3704751fa27f update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 541
diff changeset
   150
- fix hg pull --rebase
3704751fa27f update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 541
diff changeset
   151
- fix detection of conflict with external tools
3704751fa27f update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 541
diff changeset
   152
- adapt to core movement (caches and --amend)
3704751fa27f update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 541
diff changeset
   153
541
3859f8e7d0d1 pkg: prepare version 1.0.1
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 540
diff changeset
   154
1.0.1 -- 2012-08-31
3859f8e7d0d1 pkg: prepare version 1.0.1
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 540
diff changeset
   155
3859f8e7d0d1 pkg: prepare version 1.0.1
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 540
diff changeset
   156
- documentation improvement
3859f8e7d0d1 pkg: prepare version 1.0.1
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 540
diff changeset
   157
- fix a performance bug with hgweb
3859f8e7d0d1 pkg: prepare version 1.0.1
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 540
diff changeset
   158
3859f8e7d0d1 pkg: prepare version 1.0.1
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 540
diff changeset
   159
1.0 -- 2012-08-29
478
13ccb68b728d update changelog for upcoming 1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 425
diff changeset
   160
13ccb68b728d update changelog for upcoming 1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 425
diff changeset
   161
- Align with Mercurial version 2.3 (drop 2.2 support).
13ccb68b728d update changelog for upcoming 1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 425
diff changeset
   162
- stabilize handle killed parent
13ccb68b728d update changelog for upcoming 1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 425
diff changeset
   163
- stabilize handle late comer
487
595ae87e94b6 update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 483
diff changeset
   164
- stabilize handle conflicting
478
13ccb68b728d update changelog for upcoming 1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 425
diff changeset
   165
- stabilize get a --continue switch
13ccb68b728d update changelog for upcoming 1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 425
diff changeset
   166
- merge and update ignore extinct changeset in most case.
13ccb68b728d update changelog for upcoming 1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 425
diff changeset
   167
- new "troubled()" revset
479
b63da0fb8ee5 obsolete: add obsolete data to summary.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 478
diff changeset
   168
- summary now reports troubles changesets
482
d2531a747ff5 evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 479
diff changeset
   169
- new touch command
d2531a747ff5 evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 479
diff changeset
   170
- new fold command
483
b12ff7ef35b1 Introduction of olog as an alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 482
diff changeset
   171
- new basic olog alias
478
13ccb68b728d update changelog for upcoming 1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 425
diff changeset
   172
13ccb68b728d update changelog for upcoming 1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 425
diff changeset
   173
- rebase refuse to work on public changeset again
13ccb68b728d update changelog for upcoming 1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 425
diff changeset
   174
- rebase explicitly state that there is nothing to rebase because everything is
13ccb68b728d update changelog for upcoming 1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 425
diff changeset
   175
  extinct() when that happen.
13ccb68b728d update changelog for upcoming 1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 425
diff changeset
   176
- amend now cleanly abort when --change switch is misused
13ccb68b728d update changelog for upcoming 1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 425
diff changeset
   177
13ccb68b728d update changelog for upcoming 1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 425
diff changeset
   178
425
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   179
0.7 -- 2012-08-06
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   180
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   181
- hook: work around insanely huge value in obsolete pushkey call
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   182
- pushkey: properly handle abort during obsolete markers push
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   183
- amend: wrap the whole process in a single transaction.
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   184
- evolve: tweak and add EOL to kill warning
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   185
- obsolete: fix doc, rebase no longer aborts with --keep
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   186
- obsolete/evolve: fix grammar in prerequisite messages
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   187
- evolve: avoid duplication in graft wrapper
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   188
- evolve: graft --continue is optional, test
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   189
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   190
0.6 -- 2012-07-31
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   191
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   192
- obsolete: change warning output to match mercurial core on
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   193
- qsync: ignore unexistent nodes
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   194
- make compat server both compatible with "dump" and "dump%i" version
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   195
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   196
0.5 -- 2012-07-16
325
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
   197
425
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   198
- obsolete: Detect conflicting changeset!
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   199
- obsolete: adapt to core: marker are written in transaction now
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   200
- evolve: add the solve alias to obsolete
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   201
- doc: big update of terms and summary of the concept
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   202
- evolve: switch the official name for "kill" to prune
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   203
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   204
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   205
0.4.1 -- 2012-07-10
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   206
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   207
- [convert] properly exclude null successors from convertion
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   208
- Ignore buggy marker in newerversion
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   209
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   210
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   211
0.4.0 -- 2012-07-06
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   212
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   213
- obsolete: public changeset are no longer latecomer.
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   214
- obsolete: move to official binary format
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   215
- adapt for new mercurial
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   216
- obsolete: we are not compatible with 2.1 any more
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   217
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   218
0.3.0 -- 2012-06-27
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   219
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   220
- 
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   221
- obsolete:  Add "latecomer" error detection (stabilize does not handle resolution yet)
328
c046b083a5e0 README: minor changelog update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 325
diff changeset
   222
- evolve:    Introduce a new `uncommit` command to remove change from a changeset
c046b083a5e0 README: minor changelog update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 325
diff changeset
   223
- rebase:    allow the use of --keep again
c046b083a5e0 README: minor changelog update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 325
diff changeset
   224
- commit:    --amend option create obsolete marker (but still strip)
c046b083a5e0 README: minor changelog update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 325
diff changeset
   225
- obsolete:  fewer marker are created when collapsing revision.
330
c2223b3f611a more README changes (oops)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 328
diff changeset
   226
- revset:    add, successors(), allsuccessors(), precursors(), allprecursors(),
c2223b3f611a more README changes (oops)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 328
diff changeset
   227
             latecomer() and hidden()
328
c046b083a5e0 README: minor changelog update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 325
diff changeset
   228
- evolve:    add `prune` alias to `kill`.
c046b083a5e0 README: minor changelog update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 325
diff changeset
   229
- stabilize: clearly state that stabilize does nto handle conflict
330
c2223b3f611a more README changes (oops)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 328
diff changeset
   230
- template:  add an {obsolete} keyword
325
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
   231
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
   232
0.2.0 -- 2012-06-20
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
   233
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
   234
- stabilize: improve choice of the next changeset to stabilize
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
   235
- stabilize: improve resolution of several corner case
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
   236
- rebase:    handle removing empty changesets
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
   237
- rebase:    handle --collapse
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
   238
- evolve:   add `obsolete` alias to `kill`
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
   239
- evolve:   add `evolve` alias to `stabilize`
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
   240
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
   241