Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge-subrepos.t
changeset 33365 6d88468d435b
parent 33364 bf2daeddd42b
child 33366 062c1bde1781 
--- 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]
mercurial