[PATCH 1 of 2 V2] test: fix in test comment

Pierre-Yves David pierre-yves.david at ens-lyon.org
Tue Jan 15 17:55:57 CST 2013


# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
# Date 1358293589 -3600
# Node ID 470c5d72dac420aa91a45e61acf4894da7f22843
# Parent  404feac78b8a4ee77d13ac7b5271e1606b580797
test: fix in test comment

The `ui.prevent-unstable` option never makes it in the core. It behave always
this way when obsolescence feature is enabled.

See changesets c5bd753c5bc6, bacf55bd8f90 and 0f5a0a2073a8 for details

diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t
--- a/tests/test-commit-amend.t
+++ b/tests/test-commit-amend.t
@@ -498,11 +498,11 @@ Test that amend does not make it easy to
   reverting a
   $ hg commit --amend
   $ hg id
   b99e5df575f7 (a) tip
 
-Test ui.prevent-unstable
+Test rewriting leaving unstability behind is allowed
 ---------------------------------------------------------------------
 
   $ hg up '.^'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo 'b' >> a
diff --git a/tests/test-histedit-obsolete.t b/tests/test-histedit-obsolete.t
--- a/tests/test-histedit-obsolete.t
+++ b/tests/test-histedit-obsolete.t
@@ -141,12 +141,12 @@ Check that histedit respect phases
   $ hg histedit -r '.~2'
   abort: cannot edit immutable changeset: cb9a9f314b8b
   [255]
 
 
-+Test ui.prevent-unstable option
-+------------------------------------
+Test rewriting leaving unstability behind is allowed
+---------------------------------------------------------------------
 
   $ hg up '.^'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg phase --force --draft .
   $ hg log -r 'children(.)'
diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t
--- a/tests/test-rebase-obsolete.t
+++ b/tests/test-rebase-obsolete.t
@@ -277,12 +277,12 @@ not be rebased.
   $ hg debugobsolete
   5fddd98957c8a54a4d436dfe1da9d87f21a1b97b e273c5e7d2d29df783dce9f9eaa3ac4adc69c15d 0 {'date': '*', 'user': 'test'} (glob)
   32af7686d403cf45b5d95f2d70cebea587ac806a cf44d2f5a9f4297a62be94cbdd3dff7c7dc54258 0 {'date': '*', 'user': 'test'} (glob)
   42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 7c6027df6a99d93f461868e5433f63bde20b6dfb 0 {'date': '*', 'user': 'test'} (glob)
 
-Test ui.prevent-unstable option
-------------------------------------
+Test rewriting leaving unstability behind is allowed
+---------------------------------------------------------------------
 
   $ hg log -r 'children(8)'
   9:cf44d2f5a9f4 D (no-eol)
   $ hg rebase -r 8
   $ hg log -G


More information about the Mercurial-devel mailing list