Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: use single quotes around command hint
authortimeless <timeless@mozdev.org>
Thu, 14 Apr 2016 15:19:57 +0000
changeset 28963 fc1d75e7a98d
parent 28962 ad2cd2ef25d9
child 28964 9dcc9ed26d33
graft: use single quotes around command hint Windows command lines use double quotes to quote arguments with spaces. This change is in a series to unify around using single quotes around commands, and double quotes around interior arguments.
tests/test-confused-revert.t file | annotate | diff | comparison | revisions
tests/test-graft.t file | annotate | diff | comparison | revisions
tests/test-issue1175.t file | annotate | diff | comparison | revisions 
--- a/tests/test-confused-revert.t	Thu Apr 14 15:18:59 2016 +0000
+++ b/tests/test-confused-revert.t	Thu Apr 14 15:19:57 2016 +0000
@@ -60,7 +60,7 @@
 
   $ hg revert
   abort: uncommitted merge with no revision specified
-  (use "hg update" or see "hg help revert")
+  (use 'hg update' or see 'hg help revert')
   [255]
 
 Revert should be ok now:
--- a/tests/test-graft.t	Thu Apr 14 15:18:59 2016 +0000
+++ b/tests/test-graft.t	Thu Apr 14 15:19:57 2016 +0000
@@ -209,7 +209,7 @@
   my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304
   warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
-  (use hg resolve and hg graft --continue --log)
+  (use 'hg resolve' and 'hg graft --continue --log')
   [255]
 
 Summary should mention graft:
@@ -246,7 +246,7 @@
   merging e
   warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
-  (use hg resolve and hg graft --continue)
+  (use 'hg resolve' and 'hg graft --continue')
   [255]
 
 Continue without resolve should fail:
@@ -441,7 +441,7 @@
   $ hg graft 1 --tool internal:fail
   grafting 1:5d205f8b35b6 "1"
   abort: unresolved conflicts, can't continue
-  (use hg resolve and hg graft --continue)
+  (use 'hg resolve' and 'hg graft --continue')
   [255]
   $ hg resolve --all
   merging a
@@ -481,7 +481,7 @@
   $ hg graft 2 --tool internal:fail
   grafting 2:5c095ad7e90f "2"
   abort: unresolved conflicts, can't continue
-  (use hg resolve and hg graft --continue)
+  (use 'hg resolve' and 'hg graft --continue')
   [255]
   $ hg resolve --all
   merging a and b to b
@@ -768,7 +768,7 @@
   $ hg graft 28 --force --tool internal:fail
   grafting 28:50a516bb8b57 "28"
   abort: unresolved conflicts, can't continue
-  (use hg resolve and hg graft --continue)
+  (use 'hg resolve' and 'hg graft --continue')
   [255]
   $ hg resolve --all
   merging a
--- a/tests/test-issue1175.t	Thu Apr 14 15:18:59 2016 +0000
+++ b/tests/test-issue1175.t	Thu Apr 14 15:19:57 2016 +0000
@@ -72,7 +72,7 @@
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
-  (use hg resolve and hg graft --continue)
+  (use 'hg resolve' and 'hg graft --continue')
   [255]
   $ echo a > b
   $ echo b3 >> b
Mercurial