Mercurial > hg
comparison tests/test-obsolete.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 | 97513f9d2e38 |
children | 4d2b9b304ad0 |
comparison
equal
deleted
inserted
replaced
25381:47edeff19139 | 25382:6084926366b9 |
---|---|
166 parent: 5:5601fb93a350 tip | 166 parent: 5:5601fb93a350 tip |
167 add new_3_c | 167 add new_3_c |
168 branch: default | 168 branch: default |
169 commit: (clean) | 169 commit: (clean) |
170 update: (current) | 170 update: (current) |
171 phases: 3 draft (draft) | 171 phases: 3 draft |
172 remote: 3 outgoing | 172 remote: 3 outgoing |
173 | 173 |
174 $ hg summary --remote --hidden | 174 $ hg summary --remote --hidden |
175 parent: 5:5601fb93a350 tip | 175 parent: 5:5601fb93a350 tip |
176 add new_3_c | 176 add new_3_c |
177 branch: default | 177 branch: default |
178 commit: (clean) | 178 commit: (clean) |
179 update: 3 new changesets, 4 branch heads (merge) | 179 update: 3 new changesets, 4 branch heads (merge) |
180 phases: 6 draft (draft) | 180 phases: 6 draft |
181 remote: 3 outgoing | 181 remote: 3 outgoing |
182 | 182 |
183 check that various commands work well with filtering | 183 check that various commands work well with filtering |
184 | 184 |
185 $ hg tip | 185 $ hg tip |