Mercurial > evolve
comparison docs/obs-concept.rst @ 227:abe52cf492ee
doc: several update and review.
| author | Pierre-Yves.David@ens-lyon.org |
|---|---|
| date | Wed, 09 May 2012 13:08:46 +0200 |
| parents | adf92ff8d4f6 |
| children | 5a17c0d41a00 |
comparison
equal
deleted
inserted
replaced
| 226:0892b91947ef | 227:abe52cf492ee |
|---|---|
| 74 | 74 |
| 75 Every overwrite is a forced operation where the operator says "Yes I want this to | 75 Every overwrite is a forced operation where the operator says "Yes I want this to |
| 76 replace that. In highly distributed environments, a user may end up with conflicting | 76 replace that. In highly distributed environments, a user may end up with conflicting |
| 77 references and no proper way to choose. | 77 references and no proper way to choose. |
| 78 | 78 |
| 79 XXX for the above paragraph link to "unstable issue" | |
| 80 | |
| 79 Because of this way to visualize a repository, git-branches are a core | 81 Because of this way to visualize a repository, git-branches are a core |
| 80 part of git, which makes the user interface more complicated and | 82 part of git, which makes the user interface more complicated and |
| 81 constrains moving through history. | 83 constrains moving through history. |
| 82 | 84 |
| 83 Finally, even if all older changesets still exist in the repository, accesing them | 85 Finally, even if all older changesets still exist in the repository, accesing them |
| 89 ----------------------------------------------------- | 91 ----------------------------------------------------- |
| 90 | 92 |
| 91 | 93 |
| 92 As None of the concepts was powerful enough to fulfill the need of safely | 94 As None of the concepts was powerful enough to fulfill the need of safely |
| 93 rewriting history, including easy sharing and collaborating on mutable history, | 95 rewriting history, including easy sharing and collaborating on mutable history, |
| 94 we needed another one. | 96 we needed another one. |
| 95 | 97 |
| 96 Basic concept | 98 Basic concept |
| 97 ----------------------------------------------------- | 99 ----------------------------------------------------- |
| 98 | 100 |
| 99 | 101 |