--- a/docs/obs-terms.rst Tue Oct 23 16:49:29 2012 +0200
+++ b/docs/obs-terms.rst Tue Oct 23 17:32:22 2012 +0200
@@ -107,15 +107,15 @@
| | (a.k.a. divergent and | |
| | unstable) +-----------------------------+
| | | |
-| | (possible alternative | **latecomer** |
+| | (possible alternative | **bumped** |
| | names: unsettled, | |
-| | troublesome | *latecomer* is a changeset |
+| | troublesome | *bumped* is a changeset |
| | | that tries to be successor |
| | | of public changesets. |
| | | |
| | | Public changeset can't |
| | | be deleted and replace |
-| | | *latecomer* |
+| | | *bumped* |
| | | need to be converted into |
| | | an overlay to this public |
| | | changeset. |
@@ -179,13 +179,6 @@
| |
+------------------------------------------------------------------------------+
-.. note:: I'm not very happy with the naming of:
-
- - "ok" changeset
- - latecomer
- - divergent
-
- Any better idea are welcome.
Command and operation name
@@ -233,7 +226,7 @@
```````````````
Automatically resolve *troublesome* changesets
-(*unstable*, *latecomer* and *divergent*)
+(*unstable*, *bumped* and *divergent*)
This is an important name as hg pull/push will suggest it the same way it
suggest merging when you add heads.