Mercurial > hg-stable
comparison tests/test-convert-svn-sink.t @ 21947:b081decd9062 stable
resolve: add parenthesis around "no more unresolved files" message
This message may be confused with an error message. Adding parenthesis around it
will make it more recognisable as an informative message.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Sat, 26 Jul 2014 03:32:49 +0200 |
parents | e4f451c8c05c |
children | 7a9cbb315d84 |
comparison
equal
deleted
inserted
replaced
21946:868e2cea3ea0 | 21947:b081decd9062 |
---|---|
350 2 files updated, 0 files merged, 0 files removed, 1 files unresolved | 350 2 files updated, 0 files merged, 0 files removed, 1 files unresolved |
351 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 351 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
352 [1] | 352 [1] |
353 $ hg --cwd b revert -r 2 b | 353 $ hg --cwd b revert -r 2 b |
354 $ hg --cwd b resolve -m b | 354 $ hg --cwd b resolve -m b |
355 no more unresolved files | 355 (no more unresolved files) |
356 $ hg --cwd b ci -d '5 0' -m 'merge' | 356 $ hg --cwd b ci -d '5 0' -m 'merge' |
357 | 357 |
358 Expect 4 changes | 358 Expect 4 changes |
359 | 359 |
360 $ hg convert -d svn b | 360 $ hg convert -d svn b |