README
author Pierre-Yves David <pierre-yves.david@fb.com>
Thu, 17 Mar 2016 09:39:35 -0700
changeset 1626 0edb545503fe
parent 1617 160968654581
child 1627 a91115687a7e
permissions -rw-r--r--
topic: 'hg evolve --all' pick all trouble within current topic This is the first changeset of a collaboration between the topic extensions and evolve. If there is an active topic, 'hg evolve --all' will try to fix all changesets in that topic wherever they are. Aspiring descendant that are not in the current topic will be ignored. For now, evolve behave as usual if there is no active topic. This is a bit inconsistent and will probably be unified in the future.
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
1617
160968654581 url: update url to point to the latest hosting
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1611
diff changeset
    19
    evolve = PATH/TO/evolve-main/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
1603
6482497d859b readme: point to mercurial-scm.org instead of selenic.com
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1597
diff changeset
    31
Bugs are to be reported on the mercurial's bug tracker: http://bz.mercurial-scm.com/
1182
15492cea54e9 readme: add a reference to the bugtracker in the contribute section
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1175
diff changeset
    32
Use the the "evolution" component.
15492cea54e9 readme: add a reference to the bugtracker in the contribute section
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1175
diff changeset
    33
1147
94a710977768 readme: update the contribution process
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1141
diff changeset
    34
Please use the patchbomb extension to send email to mercurial devel. Please
94a710977768 readme: update the contribution process
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1141
diff changeset
    35
make sure to use the evolve-ext flag when doing so. You can use a command like
94a710977768 readme: update the contribution process
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1141
diff changeset
    36
this:
1000
8043ae3612e4 readme: mention patchbomb usage and patch description guidelines on wiki
Faheem Mitha <faheem@faheem.info>
parents: 987
diff changeset
    37
1603
6482497d859b readme: point to mercurial-scm.org instead of selenic.com
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1597
diff changeset
    38
    hg email --to mercurial-devel@mercurial-scm.org --flag evolve-ext --rev '<your patches>'
1000
8043ae3612e4 readme: mention patchbomb usage and patch description guidelines on wiki
Faheem Mitha <faheem@faheem.info>
parents: 987
diff changeset
    39
8043ae3612e4 readme: mention patchbomb usage and patch description guidelines on wiki
Faheem Mitha <faheem@faheem.info>
parents: 987
diff changeset
    40
See also
1603
6482497d859b readme: point to mercurial-scm.org instead of selenic.com
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1597
diff changeset
    41
http://mercurial-scm.org/wiki/ContributingChanges#Patch_descriptions
1000
8043ae3612e4 readme: mention patchbomb usage and patch description guidelines on wiki
Faheem Mitha <faheem@faheem.info>
parents: 987
diff changeset
    42
for guidelines on the patch description.
8043ae3612e4 readme: mention patchbomb usage and patch description guidelines on wiki
Faheem Mitha <faheem@faheem.info>
parents: 987
diff changeset
    43
8043ae3612e4 readme: mention patchbomb usage and patch description guidelines on wiki
Faheem Mitha <faheem@faheem.info>
parents: 987
diff changeset
    44
Please don't forget to update and run the tests when you fix a bug or
1526
c2a772ade409 README: update instructions for running tests.
Greg Ward <greg@gerg.ca>
parents: 1519
diff changeset
    45
add a feature. To run the tests, you need a working copy of Mercurial,
c2a772ade409 README: update instructions for running tests.
Greg Ward <greg@gerg.ca>
parents: 1519
diff changeset
    46
say in $HGSRC:
926
14d91c36f88b README: document how to run the tests
Greg Ward <greg@gerg.ca>
parents: 924
diff changeset
    47
14d91c36f88b README: document how to run the tests
Greg Ward <greg@gerg.ca>
parents: 924
diff changeset
    48
    cd tests
1526
c2a772ade409 README: update instructions for running tests.
Greg Ward <greg@gerg.ca>
parents: 1519
diff changeset
    49
    python $HGSRC/tests/run-tests.py --with-hg=$HGSRC/hg
c2a772ade409 README: update instructions for running tests.
Greg Ward <greg@gerg.ca>
parents: 1519
diff changeset
    50
c2a772ade409 README: update instructions for running tests.
Greg Ward <greg@gerg.ca>
parents: 1519
diff changeset
    51
(evolve's stable and default branches correspond to Mercurial's stable
c2a772ade409 README: update instructions for running tests.
Greg Ward <greg@gerg.ca>
parents: 1519
diff changeset
    52
and default branches. So to test evolve from default, you need
c2a772ade409 README: update instructions for running tests.
Greg Ward <greg@gerg.ca>
parents: 1519
diff changeset
    53
Mercurial on default.)
238
b5d9841defc8 more read me update
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 237
diff changeset
    54
267
34020ca0c451 README: some more changes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 261
diff changeset
    55
325
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
    56
Changelog
737
c96dd66c6839 README: fix minor markup inconsistencies
Greg Ward <greg@gerg.ca>
parents: 717
diff changeset
    57
=========
325
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
    58
1626
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1617
diff changeset
    59
5.4.0 -- 
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1617
diff changeset
    60
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1617
diff changeset
    61
- Some collaboration with the topic experimental extensions
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1617
diff changeset
    62
  - hg evolve --all with consider all trouble in your current topic
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1617
diff changeset
    63
1611
5eedfe43e762 prepare version 5.3.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1609
diff changeset
    64
5.3.0 -- 2016-02-11
1478
9603aa1ecdfd evolve: add a command to split commits
Laurent Charignon <lcharignon@fb.com>
parents: 1454
diff changeset
    65
1559
bc21846791b6 readme: add something about bookmark within transaction
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1530
diff changeset
    66
- split: add a new command to split changesets,
bc21846791b6 readme: add something about bookmark within transaction
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1530
diff changeset
    67
- tests: drop our copy of 'run-tests.py' use core one instead,
bc21846791b6 readme: add something about bookmark within transaction
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1530
diff changeset
    68
- bookmark: do all bookmark movement within a transaction.
1566
25254b2f8116 evolve: apply API change to 'merge.update'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1559
diff changeset
    69
- evolve: compatibility with Mercurial 3.7
1605
f69d8c25eeb7 readme: mark feature only available in 3.7 as such
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1603
diff changeset
    70
- evolve: support merge with a single obsolete parent (hg-3.7+ only)
1596
6079dcbfb726 readme: update readme for issue 4966
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1576
diff changeset
    71
- evolve: prevent added file to be marked as unknown if evolve fails (issue4966)
1597
7876ed4fceb7 evolve: write our own custom evolvestate file
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1596
diff changeset
    72
- evolve: stop relying on graftstate file for save evolve state
7876ed4fceb7 evolve: write our own custom evolvestate file
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1596
diff changeset
    73
          (for `hg evolve --continue`)
1609
b9e8a47c4d5c Readme: mention fix for issue4950
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1605
diff changeset
    74
- evolve: fix divergence resolution when it result in an empty commit
b9e8a47c4d5c Readme: mention fix for issue4950
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1605
diff changeset
    75
          (issue4950) (hg-3.5+ only)
1529
b338fe4e0657 readme: updateing changelog
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1526
diff changeset
    76
- no longer lock the repository for `hg parents` (issue4895)
b338fe4e0657 readme: updateing changelog
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1526
diff changeset
    77
- updated help for the `evolve` command
b338fe4e0657 readme: updateing changelog
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1526
diff changeset
    78
1519
c15d6168412f prepare version 5.1.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1518
diff changeset
    79
5.2.1 -- 2015-11-02
1501
5c962163f77a prune: ensure we prune bookmarks in a transaction
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1454
diff changeset
    80
1511
91b6a30424a3 evolve: compatibility with coming 3.6
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1503
diff changeset
    81
- add compatibility with Mercurial 3.6
1501
5c962163f77a prune: ensure we prune bookmarks in a transaction
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1454
diff changeset
    82
- prune: fixed possible issue with lock and bookmark
1503
e8f7e4c53537 next/prev: properly lock repo before touching bookmarks
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1501
diff changeset
    83
- next/prev: fixed possible issue with lock and bookmark
1518
bca3fce56b2c merge with default
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1514
diff changeset
    84
- add some progress data during changesets discovery
bca3fce56b2c merge with default
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1514
diff changeset
    85
- take advantage of dirstate/transaction collaboration
1501
5c962163f77a prune: ensure we prune bookmarks in a transaction
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1454
diff changeset
    86
1454
c79bdc856350 prepare version 5.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1449
diff changeset
    87
5.2.0 -- 2015-06-25
1357
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents: 1337
diff changeset
    88
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents: 1337
diff changeset
    89
- evolve: gain a --rev option to control what revisions to evolve (issue4391)
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents: 1337
diff changeset
    90
- evolve: revision are processed in the order they stack on destination
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents: 1337
diff changeset
    91
- evolve: properly skip unstable revision with non-evolved unstable parent
1404
848a04c078c7 evolve: add selector for trouble types
Laurent Charignon <lcharignon@fb.com>
parents: 1388
diff changeset
    92
- evolve: gain --unstable --divergent --bumped flag to select the trouble
1410
2c451fece7a6 evolve: unify revision handling and rework error message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1404
diff changeset
    93
- evolve: issue more useful error message and hint when evolve has nothing to
1420
0b714c4ad9ff evolve: consider all potential candidates on bare evolve
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    94
          do as invocated.
0b714c4ad9ff evolve: consider all potential candidates on bare evolve
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    95
- evolve: bare `hg evolve` commands now abort when multiple changesets could be
0b714c4ad9ff evolve: consider all potential candidates on bare evolve
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    96
          a target.
1422
c868a69c29c5 evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1420
diff changeset
    97
- evolve: `hg evolve --all` only evolve changeset that will end up as
c868a69c29c5 evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1420
diff changeset
    98
          descendant of the current working copy. The old behavior of `--all`
c868a69c29c5 evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1420
diff changeset
    99
          in now in `--all --any`.
1441
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1427
diff changeset
   100
- evolve: add a 'experimental.evolutioncommands' for fine grained commands
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1427
diff changeset
   101
          enabling
1447
09206bdc2db4 next: reword error output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1444
diff changeset
   102
- next/prev: requires `--merge` to move with uncommited changes
09206bdc2db4 next: reword error output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1444
diff changeset
   103
- next: significantly reword error messages
1449
9be1cadf7a07 next: add a --evolve option
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1447
diff changeset
   104
- next: add a --evolve flag to evolve aspiring children when on a head
1357
3bb7a080da4d evolve: add ordering of the revisions for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents: 1337
diff changeset
   105
1424
1377f6a7f9ec prepare version 5.1.5
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1387
diff changeset
   106
5.1.5 -- 2015-06-23
1289
12d5c9eaa86d update readme
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1281
diff changeset
   107
12d5c9eaa86d update readme
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1281
diff changeset
   108
- minor documentation cleanup
1296
23819e1d61fd evolve: add -i flag to amend command
Laurent Charignon <lcharignon@fb.com>
parents: 1289
diff changeset
   109
- support -i option for `hg amend` if commit supports it (3.4)
1312
1218ad94a351 update readme
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1296
diff changeset
   110
- fix the `debugrecordpruneparents` utility
1218ad94a351 update readme
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1296
diff changeset
   111
- fix some possible crash during command abort (release non-existant transaction)
1328
9321889d119a simple4server: update bugtracker link
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1312
diff changeset
   112
- fix simple4server bug tracker URL
1330
efb75f4d55aa bookmarks: update to use new bookmarks api via compatibility layer
Ryan McElroy <rmcelroy@fb.com>
parents: 1328
diff changeset
   113
- compatibility with bookmark API change in future Mercurial 3.5
1337
1c8fbaf9306b update README
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1330
diff changeset
   114
- prune no longer move the active bookmark for no reason (issue4559)
1375
9e062e6598e9 evolve: search divergence within all precursors
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1337
diff changeset
   115
- evolve: stop reporting divergence base as missing when we actually have it
1387
eb044bcf342d evolve: update readme regarding the preview perf improvement
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1375
diff changeset
   116
- significant performance improvement for all revsets.
1444
9a78233c62a4 readme: add an entry about the obsolete wdir parent hint
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1441
diff changeset
   117
- provide a hint of how to update to the successor of an obsolete working copy
9a78233c62a4 readme: add an entry about the obsolete wdir parent hint
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1441
diff changeset
   118
  parent.
1289
12d5c9eaa86d update readme
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1281
diff changeset
   119
1281
891c3ce894fa prepare release 5.1.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1279
diff changeset
   120
5.1.4 -- 2015-04-23
1271
792998917ece Add "documentation update" to the changelog.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1257
diff changeset
   121
792998917ece Add "documentation update" to the changelog.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1257
diff changeset
   122
- significant documentation update
1278
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1271
diff changeset
   123
- fix issue4616: pulling with bundle2 would crash if common marker when
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1271
diff changeset
   124
  discovered on non-served changesets.
1279
064cf9ee4460 debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1278
diff changeset
   125
- fix the debugobsrelsethashtree command
1271
792998917ece Add "documentation update" to the changelog.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1257
diff changeset
   126
1257
c52c15100fb2 prepare version 5.1.3
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1256
diff changeset
   127
5.1.3 -- 2015-04-20
1250
f88d5125d41b update readme
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1230
diff changeset
   128
f88d5125d41b update readme
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1230
diff changeset
   129
- discovery: fix misbehaving discovery accros python version
1254
87d626390270 update readme
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1250
diff changeset
   130
- pull: properly install the bundle2 par generator
87d626390270 update readme
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1250
diff changeset
   131
  (avoid sending all markers for each pull)
1255
a2d4901e211e commit: avoid potential deadlock
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1254
diff changeset
   132
- commit: avoid potential deadlock (acquires wlock before lock)
1256
f8cb01637e75 graft: avoid potential deadlock
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1255
diff changeset
   133
- graft: avoid potential deadlock (acquires wlock before lock)
1250
f88d5125d41b update readme
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1230
diff changeset
   134
1230
e886bc501796 preparing version 5.1.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1229
diff changeset
   135
5.1.2 -- 2015-04-01
1229
175cc89bbe4c update 5.1.2 with latest bugfix
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1206
diff changeset
   136
175cc89bbe4c update 5.1.2 with latest bugfix
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1206
diff changeset
   137
- evolve: prevent a crash in httpclient_pushobsmarkers() when pushing
175cc89bbe4c update 5.1.2 with latest bugfix
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1206
diff changeset
   138
1206
9b8628e0a142 prepare release 5.1.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1205
diff changeset
   139
5.1.1 -- 2015-03-05
1205
bfbe042a2e51 update readme
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1201
diff changeset
   140
bfbe042a2e51 update readme
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1201
diff changeset
   141
- debugobsconvert: fix invalid markers during conversion
bfbe042a2e51 update readme
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1201
diff changeset
   142
- discovery: cache some of the obs hash computation to improve performance (issue4518)
bfbe042a2e51 update readme
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1201
diff changeset
   143
- revset: fix some crash with (issue4515)
bfbe042a2e51 update readme
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1201
diff changeset
   144
1201
ee9c10728b68 fix release date in the readme
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1198
diff changeset
   145
5.1 -- 2015-01-30
1191
583f7f03434b init: don't abort Mercurial on version mismatch
Matt Mackall <mpm@selenic.com>
parents: 1189
diff changeset
   146
1198
bfe9be352453 update readme and bump version to 5.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1191
diff changeset
   147
- evolve: explicitly disable bookmark on evolve (issue4432)
1191
583f7f03434b init: don't abort Mercurial on version mismatch
Matt Mackall <mpm@selenic.com>
parents: 1189
diff changeset
   148
- evolve: don't abort Mercurial on version mismatch
1198
bfe9be352453 update readme and bump version to 5.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1191
diff changeset
   149
- comptatibility with mercurial 3.3
1191
583f7f03434b init: don't abort Mercurial on version mismatch
Matt Mackall <mpm@selenic.com>
parents: 1189
diff changeset
   150
1189
dbd0733e5840 prepare release 5.0.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   151
5.0.2 -- 2014-12-14
1185
cc3e68120185 evolve: remove the dependency to the rebase extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1182
diff changeset
   152
cc3e68120185 evolve: remove the dependency to the rebase extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1182
diff changeset
   153
- evolve: remove dependency to the rebase extension
cc3e68120185 evolve: remove the dependency to the rebase extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1182
diff changeset
   154
1175
51e1e962172c readme: prepare for release 5.0.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1174
diff changeset
   155
5.0.1 -- 2014-11-25
1140
b7d85cd8ec7b amend: allow the --logfile argument to work properly
Matt Harbison <matt_harbison@yahoo.com>
parents: 1136
diff changeset
   156
b7d85cd8ec7b amend: allow the --logfile argument to work properly
Matt Harbison <matt_harbison@yahoo.com>
parents: 1136
diff changeset
   157
- amend: fix --logfile argument
1141
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1140
diff changeset
   158
- evolve: preserve branch change when evolving
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1148
diff changeset
   159
- evolve: fix potential crash while solving `bumped` changesets.
1174
61179aeee656 readme: update changelog
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1150
diff changeset
   160
- uncommit: abort when rev specifies the current changeset
61179aeee656 readme: update changelog
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1150
diff changeset
   161
- evolve: various message improvement
61179aeee656 readme: update changelog
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1150
diff changeset
   162
- evolve: fix selection of changeset to evolve from the middle of a stack (issue4434)
61179aeee656 readme: update changelog
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1150
diff changeset
   163
- evolve: make next/prev only move bookmarks optionally
61179aeee656 readme: update changelog
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1150
diff changeset
   164
- evolve: tell user which "base of divergent changeset" is not found
61179aeee656 readme: update changelog
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1150
diff changeset
   165
61179aeee656 readme: update changelog
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1150
diff changeset
   166
1140
b7d85cd8ec7b amend: allow the --logfile argument to work properly
Matt Harbison <matt_harbison@yahoo.com>
parents: 1136
diff changeset
   167
1136
e9900a4af996 README: update for 5.0 release
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1107
diff changeset
   168
5.0.0 -- 2014-10-22
1069
356552e55489 evolve: always use the transaction version of phase movement
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1059
diff changeset
   169
356552e55489 evolve: always use the transaction version of phase movement
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1059
diff changeset
   170
- drop compat with Mercurial pre 3.2
1058
00bc31523074 uncommit: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1053
diff changeset
   171
- uncommit: add a --rev argument
1099
bac4e0bc9f6a evolve: write a status message when the working directory changes
David Soria Parra <davidsp@fb.com>
parents: 1059
diff changeset
   172
- evolve: add a `working directory now at xxxxxxxxxx` message
1106
6b0cf1b73693 evolve: replace each obsolete sha1 in the description with its latest successor
Matt Harbison <matt_harbison@yahoo.com>
parents: 1104
diff changeset
   173
- evolve: automatically translate obsolete hashes when evolving
1057
168dfc839eca readme: add missing changelog entry
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1053
diff changeset
   174
- properly skip marker creating if patch apply cleanly
1101
8cac667a0d7d prune: work around lazy revset slowdown
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1100
diff changeset
   175
- prune: work around a massive slowdown from lazy revset
1104
cb36a4eb0157 evolve: fix the 'grab' alias to work on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 1101
diff changeset
   176
- grab: "fix" the grab alias on window
1057
168dfc839eca readme: add missing changelog entry
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1053
diff changeset
   177
1136
e9900a4af996 README: update for 5.0 release
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1107
diff changeset
   178
- fix an issue where prune performance were quadratic with the number of
e9900a4af996 README: update for 5.0 release
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1107
diff changeset
   179
  changesets pruned.
e9900a4af996 README: update for 5.0 release
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1107
diff changeset
   180
- pull: use discovery to pull less obsmarkers through bundle2
e9900a4af996 README: update for 5.0 release
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1107
diff changeset
   181
e9900a4af996 README: update for 5.0 release
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1107
diff changeset
   182
1053
bfa9d535f436 README: fix version number
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1049
diff changeset
   183
4.1.0 -- 2014-08-08
976
bed842762447 amend: add -D/--current-date option, just like mq's qrefresh has
Greg Ward <greg@gerg.ca>
parents: 970
diff changeset
   184
bed842762447 amend: add -D/--current-date option, just like mq's qrefresh has
Greg Ward <greg@gerg.ca>
parents: 970
diff changeset
   185
- amend: add -D/--current-date option
985
6a37044ec0b3 amend: add -U/--current-user option (inspired by mq)
Greg Ward <greg@gerg.ca>
parents: 976
diff changeset
   186
- amend: add -U/--current-user option
987
07eef20e36b0 update readme
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 985
diff changeset
   187
- evolve: add a --tool option
1047
d830377bf186 evolve: adds a --confirm option
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1035
diff changeset
   188
- evolve: add a --confirm option
1008
a010ba5a0ffb evolve: deprecated --obsolete and --old-obsolete option on commit and graft
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1007
diff changeset
   189
- mark "commit -o", "graft -o" and "graft -O" as deprecated since they are
a010ba5a0ffb evolve: deprecated --obsolete and --old-obsolete option on commit and graft
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1007
diff changeset
   190
  unlikely to eventually make it into core.
1007
1d8ba8244001 push: put phase in the same bundle2 than changegroup and obsmarkers
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1006
diff changeset
   191
- push obsmarkers and phases in the same transaction than changesets
1d8ba8244001 push: put phase in the same bundle2 than changegroup and obsmarkers
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1006
diff changeset
   192
  (when using hg >= 3.1 and bundle2-exp is enabled)
1035
59bc29c84ce0 evolve: hide the OBSEXC message behind a config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1032
diff changeset
   193
- hide message about the obsolescence marker exchange behind a
59bc29c84ce0 evolve: hide the OBSEXC message behind a config option
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1032
diff changeset
   194
  `experimental.verbose-obsolescence-exchange` variable (default to False).
976
bed842762447 amend: add -D/--current-date option, just like mq's qrefresh has
Greg Ward <greg@gerg.ca>
parents: 970
diff changeset
   195
1030
e914884fb721 evolve: prepare release 4.0.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1028
diff changeset
   196
4.0.1 -- 2014-08-08
1028
fc2be6050312 evolve: update readme
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1010
diff changeset
   197
fc2be6050312 evolve: update readme
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1010
diff changeset
   198
- createmarkers() accept an iterable (for compat with other extension)
fc2be6050312 evolve: update readme
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1010
diff changeset
   199
970
0304fc2bab15 pkg: prepare release of version 4.0.0
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 957
diff changeset
   200
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
   201
952
f83f46411b09 evolve: bump requirement to 3.0.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 939
diff changeset
   202
- 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
   203
- 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
   204
- 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
   205
- 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
   206
- 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
   207
- 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
   208
  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
   209
- 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
   210
  - 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
   211
  - 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
   212
  - 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
   213
  - 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
   214
    - 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
   215
    - 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
   216
    - 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
   217
    - 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
   218
 - 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
   219
935
a03ea39aca2a prepare release 3.3.2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 934
diff changeset
   220
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
   221
a6a202c22b28 readme: the forgotten update strike again
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 917
diff changeset
   222
- 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
   223
  (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
   224
- 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
   225
- 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
   226
- 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
   227
- 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
   228
917
fc04758ea9f5 prepare release 3.3.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 915
diff changeset
   229
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
   230
2a057f809d03 evolve: update changelog in README
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 859
diff changeset
   231
- various language fix
914
a0e7c38a9df0 evolve: improves readme wording
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 913
diff changeset
   232
- 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
   233
- 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
   234
- 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
   235
- 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
   236
859
83882f2fbecb prepare 3.3.0 release
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 858
diff changeset
   237
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
   238
928
be39695cbfda update 3.3.0 readme to include minimal mercurial requirement
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 763
diff changeset
   239
- 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
   240
- 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
   241
  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
   242
- 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
   243
  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
   244
- 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
   245
  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
   246
- 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
   247
- 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
   248
753
c3ba8a965a7a prepare 2.8 release
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 752
diff changeset
   249
3.2.0 -- 2013-11-15
744
72d7b0b9edd6 README: update changelog
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 717
diff changeset
   250
72d7b0b9edd6 README: update changelog
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 717
diff changeset
   251
- 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
   252
- 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
   253
- amend: drop the deprecated note option
72d7b0b9edd6 README: update changelog
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 717
diff changeset
   254
- 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
   255
- 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
   256
- 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
   257
  obsolete
751
a5474648a9d2 gdown/gup: add next/previous alias
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 750
diff changeset
   258
- 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
   259
- 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
   260
- 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
   261
717
cdb52bbbe5b8 prepare release 3.1.0
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 716
diff changeset
   262
3.1.0 -- 2013-02-11
662
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 636
diff changeset
   263
698
b21437d19ea2 changelog: add more entry
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 697
diff changeset
   264
- 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
   265
- 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
   266
- 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
   267
- 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
   268
- evolve: add a --all option
715
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 711
diff changeset
   269
- prune: various minor improvements
070bbbb0e6f2 prune: add strip-like bookmark
Levi Bard <levi@unity3d.com>
parents: 711
diff changeset
   270
- 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
   271
- 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
   272
d48aae167b9d prune: documentation update
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 664
diff changeset
   273
3.0.0 -- 2013-02-02
d48aae167b9d prune: documentation update
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 664
diff changeset
   274
662
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 636
diff changeset
   275
- compatibility with 2.5
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 636
diff changeset
   276
636
27c890b4f864 evolve: make evolve smarter
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 627
diff changeset
   277
2.2.0 --
27c890b4f864 evolve: make evolve smarter
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 627
diff changeset
   278
27c890b4f864 evolve: make evolve smarter
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 627
diff changeset
   279
- 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
   280
627
28d79c21cc3a update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 602
diff changeset
   281
2.1.0 -- 2012-12-03
28d79c21cc3a update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 602
diff changeset
   282
28d79c21cc3a update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 602
diff changeset
   283
- qsync fixes
28d79c21cc3a update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 602
diff changeset
   284
- have qfold ask for commit message
28d79c21cc3a update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 602
diff changeset
   285
28d79c21cc3a update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 602
diff changeset
   286
2.0.0 -- 2012-10-26
596
5527e4fe4418 merge changelog update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 595
diff changeset
   287
5527e4fe4418 merge changelog update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 595
diff changeset
   288
- compat with mercurial 2.4
5527e4fe4418 merge changelog update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 595
diff changeset
   289
597
d14f9c4ceaa7 prepares evolve 1.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 595
diff changeset
   290
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
   291
31efc36f3aac rebase: warn about troubles created by rebase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 560
diff changeset
   292
- 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
   293
- 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
   294
- 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
   295
- smarter divergent handling
571
31efc36f3aac rebase: warn about troubles created by rebase
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 560
diff changeset
   296
597
d14f9c4ceaa7 prepares evolve 1.1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 595
diff changeset
   297
1.0.2 -- 2012-09-19
555
3704751fa27f update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 541
diff changeset
   298
3704751fa27f update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 541
diff changeset
   299
- fix hg fold bug
3704751fa27f update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 541
diff changeset
   300
- fix hg pull --rebase
3704751fa27f update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 541
diff changeset
   301
- fix detection of conflict with external tools
3704751fa27f update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 541
diff changeset
   302
- adapt to core movement (caches and --amend)
3704751fa27f update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 541
diff changeset
   303
541
3859f8e7d0d1 pkg: prepare version 1.0.1
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 540
diff changeset
   304
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
   305
3859f8e7d0d1 pkg: prepare version 1.0.1
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 540
diff changeset
   306
- documentation improvement
3859f8e7d0d1 pkg: prepare version 1.0.1
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 540
diff changeset
   307
- 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
   308
3859f8e7d0d1 pkg: prepare version 1.0.1
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 540
diff changeset
   309
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
   310
13ccb68b728d update changelog for upcoming 1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 425
diff changeset
   311
- 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
   312
- stabilize handle killed parent
13ccb68b728d update changelog for upcoming 1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 425
diff changeset
   313
- stabilize handle late comer
487
595ae87e94b6 update changelog
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 483
diff changeset
   314
- stabilize handle conflicting
478
13ccb68b728d update changelog for upcoming 1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 425
diff changeset
   315
- stabilize get a --continue switch
13ccb68b728d update changelog for upcoming 1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 425
diff changeset
   316
- 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
   317
- new "troubled()" revset
479
b63da0fb8ee5 obsolete: add obsolete data to summary.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 478
diff changeset
   318
- summary now reports troubles changesets
482
d2531a747ff5 evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 479
diff changeset
   319
- new touch command
d2531a747ff5 evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 479
diff changeset
   320
- new fold command
483
b12ff7ef35b1 Introduction of olog as an alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 482
diff changeset
   321
- new basic olog alias
478
13ccb68b728d update changelog for upcoming 1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 425
diff changeset
   322
13ccb68b728d update changelog for upcoming 1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 425
diff changeset
   323
- 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
   324
- 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
   325
  extinct() when that happen.
13ccb68b728d update changelog for upcoming 1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 425
diff changeset
   326
- 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
   327
13ccb68b728d update changelog for upcoming 1.0
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 425
diff changeset
   328
425
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   329
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
   330
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   331
- 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
   332
- 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
   333
- 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
   334
- 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
   335
- 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
   336
- 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
   337
- 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
   338
- 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
   339
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   340
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
   341
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   342
- 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
   343
- qsync: ignore unexistent nodes
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   344
- 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
   345
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   346
0.5 -- 2012-07-16
325
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
   347
425
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   348
- obsolete: Detect conflicting changeset!
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   349
- 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
   350
- 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
   351
- 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
   352
- 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
   353
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   354
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   355
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
   356
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   357
- [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
   358
- 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
   359
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   360
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   361
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
   362
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   363
- 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
   364
- 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
   365
- adapt for new mercurial
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   366
- 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
   367
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   368
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
   369
1b2757c1bd91 changelog: update changelog for all missing version
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 330
diff changeset
   370
- 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
   371
- 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
   372
- rebase:    allow the use of --keep again
c046b083a5e0 README: minor changelog update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 325
diff changeset
   373
- 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
   374
- 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
   375
- revset:    add, successors(), allsuccessors(), precursors(), allprecursors(),
c2223b3f611a more README changes (oops)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 328
diff changeset
   376
             latecomer() and hidden()
328
c046b083a5e0 README: minor changelog update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 325
diff changeset
   377
- evolve:    add `prune` alias to `kill`.
c046b083a5e0 README: minor changelog update
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 325
diff changeset
   378
- 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
   379
- template:  add an {obsolete} keyword
325
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
   380
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
   381
0.2.0 -- 2012-06-20
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
   382
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
   383
- 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
   384
- 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
   385
- rebase:    handle removing empty changesets
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
   386
- rebase:    handle --collapse
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
   387
- evolve:   add `obsolete` alias to `kill`
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
   388
- evolve:   add `evolve` alias to `stabilize`
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
   389
43a686709ded doc: readme and uncommit reference
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 324
diff changeset
   390