Mercurial > evolve

annotate README.md @ 1983:4864ddc4c6d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
destmerge: improve topic head computation and handling This rework get use two benefits: - heads are now computed on a "stabilized" state, - heads above the 'source' are now properly cleaned up,
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Mon, 15 Aug 2016 05:25:53 +0200
parents 85db8af6b5b5
children 9c7665e3107b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1839
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
1 # topics
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
2
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
3 Topics are an experiment to see if maybe the workflow defined by git
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
4 branches and hg bookmarks is only partially what users want - perhaps
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
5 something that feels more like a traditional VCS branch is right, but
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
6 that it should "dissolve" upon being finished. This extension exists
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
7 to be a sandbox for that experimentation.
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
8
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
9 # usage
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
10
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
11 Enable topics like any mercurial extension: download the source code to a
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
12 local directory, and add that directory to your `.hgrc`:
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
13
1bc5e62fc0c7 Initial dumb version of topics.
Augie Fackler <augie@google.com>
parents:
diff changeset
14 [extensions]
1926
85db8af6b5b5 readme: fix instruction to enable topic
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1913
diff changeset
15 topics=path/to/hg-topics/hgext3rd/topic/