Mercurial > public > mercurial-scm > hg

diff tests/test-commit-amend.t @ 17461:bacde764fba0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
amend: preserve phase of amended revision (issue3602) New commit from the amend process were created without any phase contraint. If the amended changeset had a different phase from it's parent, the phases data were lost. The changeset ensure the new commit are created in the same phase than the original changeset.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Thu, 30 Aug 2012 16:47:08 +0200
parents 69fa0459dd3b
children 8085fed2bf0a
line wrap: on
line diff
--- a/tests/test-commit-amend.t	Fri Sep 07 00:42:42 2012 +0900
+++ b/tests/test-commit-amend.t	Thu Aug 30 16:47:08 2012 +0200
@@ -355,3 +355,18 @@
   $ hg log -r . --debug | grep extra
   extra:       branch=a
   extra:       source=2647734878ef0236dda712fae9c1651cf694ea8a
+
+Preserve phase
+
+  $ hg phase '.^::.'
+  11: draft
+  13: draft
+  $ hg phase --secret --force .
+  $ hg phase '.^::.'
+  11: draft
+  13: secret
+  $ hg commit --amend -m 'amend for phase' -q
+  $ hg phase '.^::.'
+  11: draft
+  13: secret
+