Mercurial > public > mercurial-scm > hg-stable

diff tests/test-subrepo.t @ 25382:6084926366b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
summary: move the parents phase marker to commit line (issue4688) The phase of the pending commit depends on the parent of the working directory and on the phases.newcommit configuration. First, this information rather depend on the commit line which describe the pending commit. Then, we only want to be advertised when the pending phase is going to be higher than the default new commit phase. So the format will change from $ hg summary parent: 2:ab91dfabc5ad foo parent: 3:24f1031ad244 tip bar branch: default commit: 1 modified, 1 unknown, 1 unresolved (merge) update: (current) phases: 1 secret (secret) to parent: 2:ab91dfabc5ad foo parent: 3:24f1031ad244 tip bar branch: default commit: 1 modified, 1 unknown, 1 unresolved (merge) (secret) update: (current) phases: 1 secret
author Gilles Moris <gilles.moris@free.fr>
date Fri, 29 May 2015 22:23:58 +0200
parents 636b1f1b9f8d
children c0995cd8ff6f
line wrap: on
line diff
--- a/tests/test-subrepo.t	Mon May 25 16:48:55 2015 -0700
+++ b/tests/test-subrepo.t	Fri May 29 22:23:58 2015 +0200
@@ -38,7 +38,7 @@
   branch: default
   commit: 1 added, 1 subrepos
   update: (current)
-  phases: 1 draft (draft)
+  phases: 1 draft
   $ hg ci -m1
 
 test handling .hgsubstate "added" explicitly.
@@ -84,7 +84,7 @@
   branch: default
   commit: 1 subrepos
   update: (current)
-  phases: 2 draft (draft)
+  phases: 2 draft
   $ hg co -C 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg sum
@@ -93,7 +93,7 @@
   branch: default
   commit: (clean)
   update: (current)
-  phases: 2 draft (draft)
+  phases: 2 draft
 
 commands that require a clean repo should respect subrepos
 
@@ -116,7 +116,7 @@
   branch: default
   commit: 1 subrepos
   update: (current)
-  phases: 2 draft (draft)
+  phases: 2 draft
   $ hg ci -m2
   committing subrepository s
   committing subrepository s/ss (glob)
@@ -126,7 +126,7 @@
   branch: default
   commit: (clean)
   update: (current)
-  phases: 3 draft (draft)
+  phases: 3 draft
 
 test handling .hgsubstate "modified" explicitly.