Mercurial > hg
comparison tests/test-merge-commit.t @ 25125:bd625cd4e5e7
progress: get the extremely verbose output out of default debug
When the progress extension is not enabled, each call to 'ui.progress' used to
issue a debug message. This results is a very verbose output and often redundant
in tests. Dropping it makes tests less volatile to factor they do not meant to
test.
We had to alter the sed trick in 'test-rename-merge2.t'. Sed is used to drop all
output from a certain point and hidding the progress output remove its anchor.
So we anchor on something else.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Sat, 09 May 2015 23:40:40 -0700 |
| parents | cb15835456cb |
| children | d8463a743d7d |
comparison
equal
deleted
inserted
replaced
| 25124:d08a13215d1a | 25125:bd625cd4e5e7 |
|---|---|
| 71 resolving manifests | 71 resolving manifests |
| 72 branchmerge: True, force: False, partial: False | 72 branchmerge: True, force: False, partial: False |
| 73 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 | 73 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 |
| 74 preserving bar for resolve of bar | 74 preserving bar for resolve of bar |
| 75 bar: versions differ -> m | 75 bar: versions differ -> m |
| 76 updating: bar 1/1 files (100.00%) | |
| 77 picked tool 'internal:merge' for bar (binary False symlink False) | 76 picked tool 'internal:merge' for bar (binary False symlink False) |
| 78 merging bar | 77 merging bar |
| 79 my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9 | 78 my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9 |
| 80 premerge successful | 79 premerge successful |
| 81 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 80 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 158 resolving manifests | 157 resolving manifests |
| 159 branchmerge: True, force: False, partial: False | 158 branchmerge: True, force: False, partial: False |
| 160 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 | 159 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 |
| 161 preserving bar for resolve of bar | 160 preserving bar for resolve of bar |
| 162 bar: versions differ -> m | 161 bar: versions differ -> m |
| 163 updating: bar 1/1 files (100.00%) | |
| 164 picked tool 'internal:merge' for bar (binary False symlink False) | 162 picked tool 'internal:merge' for bar (binary False symlink False) |
| 165 merging bar | 163 merging bar |
| 166 my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9 | 164 my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9 |
| 167 premerge successful | 165 premerge successful |
| 168 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 166 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |