Mercurial > hg
comparison tests/test-merge7.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 | b081decd9062 |
| children | d8463a743d7d |
comparison
equal
deleted
inserted
replaced
| 25124:d08a13215d1a | 25125:bd625cd4e5e7 |
|---|---|
| 84 resolving manifests | 84 resolving manifests |
| 85 branchmerge: True, force: False, partial: False | 85 branchmerge: True, force: False, partial: False |
| 86 ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 | 86 ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 |
| 87 preserving test.txt for resolve of test.txt | 87 preserving test.txt for resolve of test.txt |
| 88 test.txt: versions differ -> m | 88 test.txt: versions differ -> m |
| 89 updating: test.txt 1/1 files (100.00%) | |
| 90 picked tool 'internal:merge' for test.txt (binary False symlink False) | 89 picked tool 'internal:merge' for test.txt (binary False symlink False) |
| 91 merging test.txt | 90 merging test.txt |
| 92 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 | 91 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 |
| 93 warning: conflicts during merge. | 92 warning: conflicts during merge. |
| 94 merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark') | 93 merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark') |