Mercurial > hg
comparison tests/test-merge1.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 | 1ef96a3b8b89 |
| children | fe03f522dda9 |
comparison
equal
deleted
inserted
replaced
| 25381:47edeff19139 | 25382:6084926366b9 |
|---|---|
| 38 parent: 0:538afb845929 | 38 parent: 0:538afb845929 |
| 39 commit #0 | 39 commit #0 |
| 40 branch: default | 40 branch: default |
| 41 commit: (interrupted update) | 41 commit: (interrupted update) |
| 42 update: 1 new changesets (update) | 42 update: 1 new changesets (update) |
| 43 phases: 2 draft (draft) | 43 phases: 2 draft |
| 44 $ rmdir b | 44 $ rmdir b |
| 45 $ hg up | 45 $ hg up |
| 46 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 46 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 47 $ hg sum | 47 $ hg sum |
| 48 parent: 1:b8bb4a988f25 tip | 48 parent: 1:b8bb4a988f25 tip |
| 49 commit #1 | 49 commit #1 |
| 50 branch: default | 50 branch: default |
| 51 commit: (clean) | 51 commit: (clean) |
| 52 update: (current) | 52 update: (current) |
| 53 phases: 2 draft (draft) | 53 phases: 2 draft |
| 54 | 54 |
| 55 Prepare a basic merge | 55 Prepare a basic merge |
| 56 | 56 |
| 57 $ hg up 0 | 57 $ hg up 0 |
| 58 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 58 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |