ignore merge in qsync

add a known issu

merge arne change

docs: Merged obs-concept changes by hand.

Backed out backout changeset f047cd4f1235

fix qsync-enable.sh extension name is qsync not obsolete (terrible terrible trouble)

follow-up on evolve-collaboration

add split example

doc: some minor fixes

merge with arne change

merge with backout

backout obs-concept.rst changes too much conflict with changes in another branch

docs: polish for glossary

docs: polishing of from-mq.

docs: fix typos in evolve collaboration.

docs: added a question: split changesets?

docs: fix typos in the FAQ

evolve: logopts was called logopt.

docs: typo

docs: polishing of obs-concept.rst

docs: some fixes on the index and the first half of the obsolete concepts.

merge

many fixes

doc: replace ">" by ">>" (oups)

doc: add reference to qsync

merge with auc improvement

auc improvement of the doc

add more canveas

add auc user story

big doc update

title reorganisation

improved intro about evolve

more doc update

add svg for schema

More doc and index with sphynx

mercurial 2.1.2 compat

really add qsync enable

this is an FAQ not a tutorial

add version info

some more doc update

add a qsync-enable

use cat in enable.sh

add qsync extension to mutable history

very cruse evolve tutorial

evolve: improve graft handling of -O we now resolve changeset reference before graft

obsolete: improve rebase compat

import some doc

obsolete: define an unstable property on context

kill: properly get revision pointed by --new Previously the raw value on --new ended in the obsolete file.

stabilize: proper --quiet behavior

stabilize: stabilize my topological branch only if not stated otherwize.

Add a bosancestors revset

add an obsolete parent revset and related alias

overwrite user not date

remove useless hidden related stuff in amend

add user to the list of option prevent the "no change found" message to show up

evolve that does something \o/

stuff that pass

fix evolve test

add test for revset

obsolete: add revset for various error case

add a simple script to help people enabling the extension.

rename evolution to evolve too much confusion with the email client

obsolete: alter newerversion return prepare ability to split and return kill information.

keep branch on amend

evolution: add a --new argument for kill

obsolete: lazy relation adding

obsolete: remove outgoing filtering as it is taken care but forcing obsolete to be secret

Add gup and gdown command to mimic qpop and qpush command

obsolete: stop using rev as it rebuild the cache every time there is a fault We now use nodemap directly

remove dead comment

obsolete: clever obsolete not in secret detection to avoid locking the repo without a reason.

obsolete: fix locking when enforcing obsolete as secret

Locking while writing obsolete data.

obsolete: improve locking when writing obsolete data

obsolete: remove public revset (it's now expected to be in core)

evolution: proper locking scheme (maybe a bit zelous with wlock and lock)

edit option \o/

Add a -o and -O option to graft.

Add a -o option to commit

add an option to ensure unstable are secret

nicer hiddenrevs init

adapt evolution to phase in core.

adapt obsolete to phase.

more removal from phase in core.

remote the states extention. (phase are now in mercurial core)

obsolete: smarter initialisation of obsolete stuff from disk.

Properly inherit phase of relocated changeset.

Add a states.bypass option to push without touching state.

Allow setstate with the last non trcked state.

Add missing break line at the end of a debug message

propertly handle -m and -l option

amend: add a --branch option

monkeypatch strip fancier

fix strip - seems good enougth now

[states] fix strip but one thing still stay wrong (see test test-state-strip.t)

[states] fix strip but a case still does not work (see test test-state-strip.t)

[states] make enabling state saftier * Fix the lower state heads while enabling a state. * Add a --clever opiton that do not fix the lower heads (as earlier) * Add test for enable/disable state

[states] make disabling state saftier It is not allowed to disable a state that is not empty because "Explicit is better than implicit". A hint is displayed to help the user.

[states] add --exact option to `hg <state> <nodes>` that allows to backward states bondaries

improve tuto

[evolution:evolve] use short hex instead of rev number

docs: Small tutorial

[evolution:amend] prevent amending immutable changeset.

[evolution:relocate] propertly interpred src and destination.

[states] do not activate deactivated state with ``hg states --off <state>`` previously: $ hg init alpha $ cd alpha $ hg states --off draft $ hg states published draft now: $ hg init alpha $ cd alpha $ hg states --off draft $ hg states published

[obsolet] base64 encore obsolete rel for pushkey Yop this is ugly

[evolution] first workign draft of a relocate function The relocate function is a lighter rebase.

[evolution/obsolete] very experimental and crude evolve support.

[obsolete] code section comment for repo subclassing

[obsolete] vocabulary update suggestion

[obsolete] rebase always keep changeset.

Compat with mercurial 1.9.2

[evolution] imported hg amend from parren works (this rocks heavily)

Basic kill command

[obsolete] add kill support

[obsolete] issue a warning when parent of current directory is obsolete.

[states] add some documentation for extension wrapping

[states] update qimport code so it doesn't fails on qimport without -r

mention plan for hook in the documentation