annotate README @ 285:691cb55358b0

obsolete: do not obsolete rebase --detach nullmerge revs Rebase state contains the changesets to rebase as well as 'nullmerge' entries used drive the merge strategy. These nullmerge were not rebased and should be ignored, and certainly not be marked obsolete.
author Patrick Mezard <patrick@mezard.eu>
date Wed, 20 Jun 2012 14:43:20 +0200
parents 34020ca0c451
children 232990fbecb5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
33
dca86448d736 Add some doc.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
1 =============================
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
dca86448d736 Add some doc.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
5 :obsolete:
dca86448d736 Add some doc.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
6
35
0f98f87881bd Spelling fixes
Julien Cristau <julien.cristau@logilab.fr>
parents: 34
diff changeset
7 Introduce an ``obsolete`` concept that tracks new versions of rewritten
0f98f87881bd Spelling fixes
Julien Cristau <julien.cristau@logilab.fr>
parents: 34
diff changeset
8 changesets.
33
dca86448d736 Add some doc.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
9
237
215e78166ef9 update README
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 70
diff changeset
10 :evolve:
35
0f98f87881bd Spelling fixes
Julien Cristau <julien.cristau@logilab.fr>
parents: 34
diff changeset
11 A collection of commands to rewrite the mutable part of the history.
33
dca86448d736 Add some doc.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
12
dca86448d736 Add some doc.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
13
dca86448d736 Add some doc.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
14
dca86448d736 Add some doc.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
15 **These extensions are experimental and are not meant for production.**
dca86448d736 Add some doc.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
16
dca86448d736 Add some doc.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
17
237
215e78166ef9 update README
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 70
diff changeset
18 See doc/ directory for details
238
b5d9841defc8 more read me update
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 237
diff changeset
19
b5d9841defc8 more read me update
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 237
diff changeset
20 Contribute
b5d9841defc8 more read me update
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 237
diff changeset
21 ==================
b5d9841defc8 more read me update
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 237
diff changeset
22
267
34020ca0c451 README: some more changes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 261
diff changeset
23 The simplest way to contribute is to issue a pull request on bitbucket.
238
b5d9841defc8 more read me update
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 237
diff changeset
24
267
34020ca0c451 README: some more changes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 261
diff changeset
25 However, some cutting edge change may be found in a mutable repository hosted
34020ca0c451 README: some more changes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 261
diff changeset
26 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
27
b5d9841defc8 more read me update
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 237
diff changeset
28 http://hg-lab.logilab.org/wip/mutable-history/
b5d9841defc8 more read me update
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 237
diff changeset
29
267
34020ca0c451 README: some more changes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 261
diff changeset
30 Make sure to check lastest draft changeset before submitting new changeset.
261
240b37998806 added “pull here is OK, too” to the README.
Arne Babenhauserheide <bab@draketo.de>
parents: 239
diff changeset
31
267
34020ca0c451 README: some more changes
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 261
diff changeset
32