# HG changeset patch
# User timeless <timel...@mozdev.org>
# Date 1474415288 0
# Tue Sep 20 23:48:08 2016 +0000
# Node ID 745cb8e2928b177706cfee03f298ed0873c9d538
# Parent 07753ca55667d0079f2418084dbf4ebab523cb35
# Available At https://bitbucket.org/timeless/mercurial-crew
# hg pull https://bitbucket.org/timeless/mercurial-crew -r
745cb8e2928b
localrepo: use single quotes in use warning
diff -r 07753ca55667 -r 745cb8e2928b mercurial/localrepo.py
--- a/mercurial/localrepo.py Tue Sep 20 23:47:46 2016 +0000
+++ b/mercurial/localrepo.py Tue Sep 20 23:48:08 2016 +0000
@@ -1626,7 +1626,7 @@
if list(ms.unresolved()):
raise error.Abort(_('unresolved merge conflicts '
- '(see "hg help resolve")'))
+ "(see 'hg help resolve')"))
if ms.mdstate() != 's' or list(ms.driverresolved()):
raise error.Abort(_('driver-resolved merge conflicts'),
hint=_('run "hg resolve --all" to resolve'))
diff -r 07753ca55667 -r 745cb8e2928b tests/test-commit-unresolved.t
--- a/tests/test-commit-unresolved.t Tue Sep 20 23:47:46 2016 +0000
+++ b/tests/test-commit-unresolved.t Tue Sep 20 23:48:08 2016 +0000
@@ -34,7 +34,7 @@
$ echo "ABCD" > A
$ hg commit -m "Merged"
- abort: unresolved merge conflicts (see "hg help resolve")
+ abort: unresolved merge conflicts (see 'hg help resolve')
[255]
Mark the conflict as resolved and commit
@@ -56,7 +56,7 @@
[1]
$ hg rm --force A
$ hg commit -m merged
- abort: unresolved merge conflicts (see "hg help resolve")
+ abort: unresolved merge conflicts (see 'hg help resolve')
[255]
$ hg resolve -ma
diff -r 07753ca55667 -r 745cb8e2928b tests/test-graft.t
--- a/tests/test-graft.t Tue Sep 20 23:47:46 2016 +0000
+++ b/tests/test-graft.t Tue Sep 20 23:48:08 2016 +0000
@@ -253,7 +253,7 @@
$ hg graft -c
grafting 4:9c233e8e184d "4"
- abort: unresolved merge conflicts (see "hg help resolve")
+ abort: unresolved merge conflicts (see 'hg help resolve')
[255]
Fix up:
diff -r 07753ca55667 -r 745cb8e2928b tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t Tue Sep 20 23:47:46 2016 +0000
+++ b/tests/test-rebase-conflicts.t Tue Sep 20 23:48:08 2016 +0000
@@ -75,7 +75,7 @@
$ hg rebase --continue
already rebased 3:3163e20567cc "L1" as 3e046f2ecedb
rebasing 4:46f0b057b5c0 "L2"
- abort: unresolved merge conflicts (see "hg help resolve")
+ abort: unresolved merge conflicts (see 'hg help resolve')
[255]
Conclude rebase:
diff -r 07753ca55667 -r 745cb8e2928b tests/test-rename-merge2.t
--- a/tests/test-rename-merge2.t Tue Sep 20 23:47:46 2016 +0000
+++ b/tests/test-rename-merge2.t Tue Sep 20 23:48:08 2016 +0000
@@ -719,7 +719,7 @@
--------------
M a
M b
- abort: unresolved merge conflicts (see "hg help resolve")
+ abort: unresolved merge conflicts (see 'hg help resolve')
--------------
$ tm "up a b" "nm a b" " " "19 merge b no ancestor, prompt remove a"
@@ -764,7 +764,7 @@
--------------
M b
C a
- abort: unresolved merge conflicts (see "hg help resolve")
+ abort: unresolved merge conflicts (see 'hg help resolve')
--------------
$ tm "up a " "um a b" " " "20 merge a and b to b, remove a"
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
