evolve: comparison tests/test-evolve.t

equal deleted inserted replaced

-:099e0ca8285e
+:de9089514833
 Obsolescence markers will be exchanged between repositories that
 explicitly assert support for the obsolescence feature (this can currently
 only be done via an extension).
-Instability ==========
+Instability
+===========
-(note: the vocabulary is in the process of being updated)
+Rewriting changesets might introduce instability.
-Rewriting changesets might introduce instability (currently 'trouble').
 There are two main kinds of instability: orphaning and diverging.
-Orphans are changesets left behind when their ancestors are rewritten,
+Orphans are changesets left behind when their ancestors are rewritten.
-(currently: 'unstable'). Divergence has two variants:
+Divergence has two variants:
 * Content-divergence occurs when independent rewrites of the same
-changesets lead to different results. (currently: 'divergent')
+changesets lead to different results.
 * Phase-divergence occurs when the old (obsolete) version of a changeset
-becomes public. (currently: 'bumped')
+becomes public.
-If it possible to prevent local creation of orphans by using the following
+It is possible to prevent local creation of orphans by using the following
 config:
 [experimental]
 evolution=createmarkers,allnewcommands,exchange
 $ hg log
 6	feature-B: another feature that rox - test
 4	feature-A: a nifty feature - test
 0	: base - test
-phase change turning obsolete changeset public issue a bumped warning
+phase change turning obsolete changeset public issues a phase divergence warning
 $ hg phase --hidden --public 99833d22b0c6
 1 new phase-divergent changesets
-all solving bumped troubled
+all solving phase-divergent
 $ glog
 @  6:47d52a103155@default(draft) another feature that rox
 |
 | o  5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
 o  0:e55e0562ee93@default(public) base
 $ hg evolve --any --traceback --phase-divergent
 recreate:[6] another feature that rox
 atop:[5] another feature (child of ba0ec09b1bab)
-computing new diff
 committed as aca219761afb
 working directory is now at aca219761afb
 $ glog
 @  7:aca219761afb@default(draft) phase-divergent update to 99833d22b0c6:
 |
 --- a/main-file-1
 +++ b/main-file-1
 @@ -3,1 +3,1 @@
 -Zwei
 +deux
-$ hg log -r 'phasedivergent()' # no more bumped
+$ hg log -r 'phasedivergent()' # no more phase-divergent
 test evolve --all
 $ sed -i'' -e s/deux/to/ main-file-1
 $ hg commit -m 'dansk 2!'
 $ sed -i'' -e s/Three/tre/ main-file-1
 | x  6:faafc6cea0ba@default(draft) a1_
 |/
 o  0:07c1c36d9ef0@default(draft) a0
-Possibility to select what trouble to solve first, asking for bumped before
+Possibility to select what instability to solve first, asking for
-divergent
+phase-divergent before content-divergent
 $ hg up -r "desc('a1__')"
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg revert -r d952e93add6f --all
 reverting a
 $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
 | x  6	: a1_ - test
 |/
 o  0	: a0 - test
-Now we have a bumped and an unstable changeset, we solve the bumped first
+Now we have a phase-divergent and an orphan changeset, we solve the
-normally the unstable changeset would be solve first
+phase-divergent first. Normally the orphan changeset would be solved first
 $ hg log -G
 @  11	: add new file bumped - test
 |
 | o  10	: a2 - test
 o  0	: a0 - test
 $ hg evolve -r "desc('add new file bumped')" --phase-divergent
 recreate:[11] add new file bumped
 atop:[10] a2
-computing new diff
 committed as a8bb31d4b7f2
 working directory is now at a8bb31d4b7f2
 $ hg evolve --any
 move:[8] a3
 atop:[12] phase-divergent update to d952e93add6f:
 o  9:9f8b83c2e7f3@default(public) a1__
 |
 o  0:07c1c36d9ef0@default(public) a0
-Check that we can resolve troubles in a revset with more than one commit
+Check that we can resolve instabilities in a revset with more than one commit
 $ hg up b88539ad24d7 -C
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ mkcommit gg
 $ hg up b88539ad24d7
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 $ echo a > a
 $ for fn in a b c; do echo foo > $fn; hg ci -Am "added "$fn; done;
 adding a
 adding b
 adding c
-Lets create a merge commit so that we can create orhpan merge later:
+Let's create a merge commit so that we can create orphan merge later:
 $ hg up 1 -q
 $ echo feature > f
 $ hg ci -Am "added feature f"
 adding f
 created new head
 |
 o  0:f7ad41964313@default(draft) added a
 To check `lastsolved` contain right value after completion of orphan-merge
-resolution there should be one more trouble to be evolved; lets create one:
+resolution there should be one more instability to be evolved; lets create one:
 $ hg up 1 -q
 $ echo d > d
 $ hg ci -Am "added d"
 adding c
 adding d

branch	stable
changeset 4507	de9089514833
parent 4471	3caa4a459439
child 4512	7a779a288793
child 4576	96ce1030d2fb