Mercurial > hg

comparison tests/test-commit-amend.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 701df761aa94
children eb52de500d2a
comparison
equal deleted inserted replaced
25381:47edeff19139 25382:6084926366b9
70 parent: 1:43f1ba15f28a tip 70 parent: 1:43f1ba15f28a tip
71 amend base1 71 amend base1
72 branch: default 72 branch: default
73 commit: 1 added, 1 unknown 73 commit: 1 added, 1 unknown
74 update: (current) 74 update: (current)
75 phases: 2 draft (draft) 75 phases: 2 draft
76 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend 76 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend
77 transaction abort! 77 transaction abort!
78 rollback completed 78 rollback completed
79 abort: empty commit message 79 abort: empty commit message
80 [255] 80 [255]
82 parent: 1:43f1ba15f28a tip 82 parent: 1:43f1ba15f28a tip
83 amend base1 83 amend base1
84 branch: default 84 branch: default
85 commit: 1 added, 1 unknown 85 commit: 1 added, 1 unknown
86 update: (current) 86 update: (current)
87 phases: 2 draft (draft) 87 phases: 2 draft
88 88
89 Add new file: 89 Add new file:
90 $ hg ci --amend -m 'amend base1 new file' 90 $ hg ci --amend -m 'amend base1 new file'
91 saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-7a3b3496-amend-backup.hg (glob) 91 saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-7a3b3496-amend-backup.hg (glob)
92 92