equal
deleted
inserted
replaced
355 fact that it recognizes instability like orphan changesets and provides |
355 fact that it recognizes instability like orphan changesets and provides |
356 a consistent way for you to get back to a stable repository. |
356 a consistent way for you to get back to a stable repository. |
357 |
357 |
358 (Incidentally, there are two other types of instability that changesets |
358 (Incidentally, there are two other types of instability that changesets |
359 can get into with ``evolve``: they may be *content-divergent* or |
359 can get into with ``evolve``: they may be *content-divergent* or |
360 *bumped*. Both of those states are more likely to occur when |
360 *phase-divergent*. Both of those states are more likely to occur when |
361 `sharing mutable history`_, so we won't cover them in this user guide.) |
361 `sharing mutable history`_, so we won't cover them in this user guide.) |
362 |
362 |
363 .. _`sharing mutable history`: sharing.html |
363 .. _`sharing mutable history`: sharing.html |
364 |
364 |
365 |
365 |