Mercurial > hg
comparison tests/test-subrepo-svn.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 | bd625cd4e5e7 |
| children | 048e41e9a6ac |
comparison
equal
deleted
inserted
replaced
| 25381:47edeff19139 | 25382:6084926366b9 |
|---|---|
| 70 parent: 1:* tip (glob) | 70 parent: 1:* tip (glob) |
| 71 1 | 71 1 |
| 72 branch: default | 72 branch: default |
| 73 commit: (clean) | 73 commit: (clean) |
| 74 update: (current) | 74 update: (current) |
| 75 phases: 2 draft (draft) | 75 phases: 2 draft |
| 76 $ hg ci -moops | 76 $ hg ci -moops |
| 77 nothing changed | 77 nothing changed |
| 78 [1] | 78 [1] |
| 79 | 79 |
| 80 debugsub | 80 debugsub |
| 95 parent: 1:* tip (glob) | 95 parent: 1:* tip (glob) |
| 96 1 | 96 1 |
| 97 branch: default | 97 branch: default |
| 98 commit: 1 modified, 1 subrepos | 98 commit: 1 modified, 1 subrepos |
| 99 update: (current) | 99 update: (current) |
| 100 phases: 2 draft (draft) | 100 phases: 2 draft |
| 101 $ hg commit --subrepos -m 'Message!' | grep -v Updating | 101 $ hg commit --subrepos -m 'Message!' | grep -v Updating |
| 102 committing subrepository s | 102 committing subrepository s |
| 103 Sending*s/alpha (glob) | 103 Sending*s/alpha (glob) |
| 104 Transmitting file data . | 104 Transmitting file data . |
| 105 Committed revision 3. | 105 Committed revision 3. |
| 136 parent: 2:* tip (glob) | 136 parent: 2:* tip (glob) |
| 137 Message! | 137 Message! |
| 138 branch: default | 138 branch: default |
| 139 commit: (clean) | 139 commit: (clean) |
| 140 update: (current) | 140 update: (current) |
| 141 phases: 3 draft (draft) | 141 phases: 3 draft |
| 142 | 142 |
| 143 $ echo a > s/a | 143 $ echo a > s/a |
| 144 | 144 |
| 145 should be empty despite change to s/a | 145 should be empty despite change to s/a |
| 146 | 146 |