Mercurial > public > mercurial-scm > hg-stable
diff tests/test-merge-subrepos.t @ 33365:6d88468d435b
subrepo: make the output references to subrepositories consistent
Well, mostly. The annotation on subrepo functions tacks on a parenthetical to
the abort message, which seems reasonable for a generic mechanism. But now all
messages consistently spell out 'subrepository', and double quote the name of
the repo. I noticed the inconsistency in the change for the last commit.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sun, 09 Jul 2017 16:13:30 -0400 |
| parents | bf2daeddd42b |
| children | 062c1bde1781 |
line wrap: on
line diff
--- a/tests/test-merge-subrepos.t Sun Jul 09 02:55:46 2017 -0400 +++ b/tests/test-merge-subrepos.t Sun Jul 09 16:13:30 2017 -0400 @@ -21,7 +21,7 @@ Should fail, since there are added files to subrepo: $ hg merge - abort: uncommitted changes in subrepository 'subrepo' + abort: uncommitted changes in subrepository "subrepo" [255] Deleted files trigger a '+' marker in top level repos. Deleted files are also @@ -80,7 +80,7 @@ M subrepo/b $ hg up -r '.^' --check - abort: uncommitted changes in subrepository 'subrepo' + abort: uncommitted changes in subrepository "subrepo" [255] $ hg sum @@ -103,7 +103,7 @@ missing file in the top level repo. $ hg up -r '.^' --check - abort: uncommitted changes in subrepository 'subrepo' + abort: uncommitted changes in subrepository "subrepo" [255] $ hg up -r '.^' --config ui.interactive=True << EOF @@ -126,5 +126,5 @@ Merge sees deleted subrepo files as an uncommitted change $ hg merge @other - abort: uncommitted changes in subrepository 'subrepo' + abort: uncommitted changes in subrepository "subrepo" [255]