Mercurial > hg-stable
changeset 18439:c6e3fa134da5
test-histedit: reorder phases test and prepare for more
We are going to add a lot regarding phase of test while fixing issue3724.
This movement allows to put them after this first phase test.
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Wed, 16 Jan 2013 19:19:56 +0100 |
| parents | 81e77a8820f3 |
| children | 35513c59f376 |
| files | tests/test-histedit-obsolete.t |
| diffstat | 1 files changed, 25 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-histedit-obsolete.t Wed Jan 16 19:17:36 2013 +0100 +++ b/tests/test-histedit-obsolete.t Wed Jan 16 19:19:56 2013 +0100 @@ -125,31 +125,12 @@ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved -Check that histedit respect phases -========================================= - -(not directly related to the test file but doesn't deserve it's own test case) - - $ hg log -G - @ 9:c13eb81022ca f - | - o 6:b346ab9a313d c - | - o 0:cb9a9f314b8b a - - $ hg ph -pv '.^' - phase changed for 2 changesets - $ hg histedit -r '.~2' - abort: cannot edit immutable changeset: cb9a9f314b8b - [255] - Test that rewriting leaving instability behind is allowed --------------------------------------------------------------------- $ hg up '.^' 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg ph --force --draft '.' $ hg log -r 'children(.)' 9:c13eb81022ca f (no-eol) $ cat > commands.txt <<EOF @@ -171,3 +152,28 @@ stabilise $ hg rebase -r 'unstable()' -d . + +Check that histedit respect phases +========================================= + +(not directly related to the test file but doesn't deserve it's own test case) + + $ cat >> $HGRCPATH << EOF + > [ui] + > logtemplate= {rev}:{node|short} ({phase}) {desc|firstline}\n + > EOF + + $ hg ph -pv '.^' + phase changed for 2 changesets + $ hg log -G + @ 11:b449568bf7fc (draft) f + | + o 10:40db8afa467b (public) c + | + o 0:cb9a9f314b8b (public) a + + $ hg histedit -r '.~2' + abort: cannot edit immutable changeset: cb9a9f314b8b + [255] + +