[PATCH 3 of 4] graft: use single quotes around command hint
timeless at gcc2-power8.osuosl.org
timeless at gcc2-power8.osuosl.org
Thu Apr 14 11:24:44 EDT 2016
# HG changeset patch
# User timeless <timeless at mozdev.org>
# Date 1460647197 0
# Thu Apr 14 15:19:57 2016 +0000
# Node ID b83f18c6ba2beba79fab16898371d6371dd94c7f
# Parent 30a86d7c44ae3e895539ca8047fdd9d21ad4abfc
# EXP-Topic quotes
# Available At bb://timeless/mercurial-crew
# hg pull bb://timeless/mercurial-crew -r b83f18c6ba2b
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.
diff -r 30a86d7c44ae -r b83f18c6ba2b tests/test-confused-revert.t
--- 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:
diff -r 30a86d7c44ae -r b83f18c6ba2b tests/test-graft.t
--- 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 at 1905859650ec+ other e at 9c233e8e184d ancestor e at 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
diff -r 30a86d7c44ae -r b83f18c6ba2b tests/test-issue1175.t
--- 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
More information about the Mercurial-devel
mailing list