comparison tests/test-import.t @ 25382:6084926366b9

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 7b3feaa1ee3f
children 0b6dee81ebb7
comparison
equal deleted inserted replaced
25381:47edeff19139 25382:6084926366b9
988 parent: 1:d59915696727 tip 988 parent: 1:d59915696727 tip
989 help management of empty pkg and lib directories in perforce 989 help management of empty pkg and lib directories in perforce
990 branch: default 990 branch: default
991 commit: (clean) 991 commit: (clean)
992 update: (current) 992 update: (current)
993 phases: 2 draft (draft) 993 phases: 2 draft
994 994
995 $ hg diff --git -c tip 995 $ hg diff --git -c tip
996 diff --git a/lib/place-holder b/lib/place-holder 996 diff --git a/lib/place-holder b/lib/place-holder
997 new file mode 100644 997 new file mode 100644
998 --- /dev/null 998 --- /dev/null