site

Commit (click to see the diff): f047cd4f12358b479ddf77775582c15b0515f5c1

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

Pierre-Yves David

Files in this revision

• .hgignore
• Makefile
• README
• docs/README
• docs/conf.py
• docs/evolve-collaboration.rst
• docs/evolve-faq.rst
• docs/figures/error-conflicting.svg
• docs/figures/error-extinct.svg
• docs/figures/error-obsolete.svg
• docs/figures/error-unstable.svg
• docs/figures/example-1-update.svg
• docs/figures/example-2-split.svg
• docs/figures/simple-3-merge.svg
• docs/figures/simple-4-reorder.svg
• docs/figures/simple-5-delete.svg
• docs/from-mq.rst
• docs/glossary.rst
• docs/index.rst
• docs/obs-concept.rst
• docs/obs-implementation.rst
• docs/tutorials/tutorial.t
• enable.sh
• hgext/evolve.py
• hgext/obsolete.py
• hgext/qsync.py
• qsync-enable.sh
• tests/killdaemons.py
• tests/run-tests.py
• tests/test-evolve.t
• tests/test-obsolete.t
• tests/test-tutorial.t