350 Now that you've got a solid understanding of how ``evolve`` works in |
350 Now that you've got a solid understanding of how ``evolve`` works in |
351 concert with changeset obsolescence, let's explore some more advanced |
351 concert with changeset obsolescence, let's explore some more advanced |
352 scenarios. All of these scenarios will involve *unstable* changesets, |
352 scenarios. All of these scenarios will involve *unstable* changesets, |
353 which is an unavoidable consequence of obsolescence. What really sets |
353 which is an unavoidable consequence of obsolescence. What really sets |
354 ``evolve`` apart from other history modification mechanisms is the |
354 ``evolve`` apart from other history modification mechanisms is the |
355 fact that it recognizes troubles like unstable changesets and provides |
355 fact that it recognizes instability like unstable 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 troubles that changesets |
358 (Incidentally, there are two other types of instability that changesets |
359 can get into with ``evolve``: they may be *divergent* or |
359 can get into with ``evolve``: they may be *divergent* or |
360 *bumped*. Both of those states are more likely to occur when |
360 *bumped*. 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 |