3541
Comment: define troubled
|
4099
explain unstable
|
Deletions are marked like this. | Additions are marked like this. |
Line 21: | Line 21: |
* (Even if they can stay around unsolved for a while), | (Even if they can stay around unsolved for a while), |
Line 35: | Line 35: |
{i} [[https://www.mercurial-scm.org/doc/evolution/user-guide.html#id19|Related documentation]] Instability happens when a changesets with descendant is rewritten. The non-obsolete descendant of the now obsolete changeset are said "unstable changesets". A Changeset is "unstable" because either: * one of its parents is obsolete, * one of its parents is unstable. Automatic resolution of instability if node by ''rebasing'' the unstable changesets on the latest known successors of its obsolete parent. (Changeset unstable because the parent is unstable needs to wait for their unstable parent to be '''stabilized''' before we can solve them.) |
|
Line 36: | Line 47: |
|| bumped || bumping || || || in use || || invalidated || invalidation?|| || || || || behind || ? || || || || || superseded || ? || || || || || lagging || lagginess? || || || || || obviated || ? || || || || |
|| unstable || instability || || || in use || || unsettled || ? || || || || || uprooted || ? || || || || |
Line 44: | Line 53: |
{i} [[https://www.mercurial-scm.org/doc/evolution/sharing.html#id18|related documentation]] |
Describe CEDVocabulary here.
Changeset Evolution - Vocabulary
This page is intended for developer
This pages gather data from discussion about the named use within the ChangesetEvolution concept.
Contents
Troubles
"troubled" changeset and troubles
Definition and property:
Evolving history can introduce problems that need to be solved.:
- They are intrinsic side effect of the free exchange and rewrite of draft changeset,
- They are and unhealthy state the user needs to take care of before moving forward,
- (Even if they can stay around unsolved for a while),
- They are not critical, we know how to detect and solve them,
- They are different kind of them.
Changeset adjective |
Concept name |
pro |
con |
status |
troubled |
Troubles |
|
|
in use |
conflicted |
conflicts? |
|
|
|
invalid |
? |
|
|
|
unevolved |
unevolution? |
|
|
|
dirty |
dirtiness? |
|
|
|
"unstable" changeset and "instability"
Instability happens when a changesets with descendant is rewritten. The non-obsolete descendant of the now obsolete changeset are said "unstable changesets".
A Changeset is "unstable" because either:
- one of its parents is obsolete,
- one of its parents is unstable.
Automatic resolution of instability if node by rebasing the unstable changesets on the latest known successors of its obsolete parent. (Changeset unstable because the parent is unstable needs to wait for their unstable parent to be stabilized before we can solve them.)
Changeset adjective |
Concept name |
pro |
con |
status |
unstable |
instability |
|
|
in use |
unsettled |
? |
|
|
|
|| uprooted || ? || || || ||
"Bumped" changeset and "bumping"
Changeset adjective |
Concept name |
pro |
con |
status |
bumped |
bumping |
|
|
in use |
invalidated |
invalidation? |
|
|
|
behind |
? |
|
|
|
superseded |
? |
|
|
|
lagging |
lagginess? |
|
|
|
obviated |
? |
|
|
|
"divergent" changeset and "divergence"
Changeset adjective |
Concept name |
pro |
con |
status |
unstable |
instability |
|
|
in use |
unsettled |
? |
|
|
|
uprooted |
? |
|
|
|
Obsolescence graph
"Successor"
Noun |
verb |
pro |
con |
status |
Successor |
supersede |
|
|
in use |
Successor |
suceed |
|
|
in use |
replacement |
replace |
|
|
|
next |
? |
|
|
|
"Precursor"
Noun |
verb |
pro |
con |
status |
precursor |
precede? |
|
|
in use |
original |
? |
|
|
|
predecessor |
precede |
|
|
|
progenitor |
? |
|
|
|
previous |
? |
|
|
|
prior |
? |
|
|
|
antecedent |
? |
|
|
|