error: unify the error message formats for 'rebase' and 'unshelve'
Differential Revision: https://phab.mercurial-scm.org/D8730
--- a/hgext/rebase.py Wed Apr 01 08:42:00 2020 -0500
+++ b/hgext/rebase.py Mon Jul 13 16:42:44 2020 -0700
@@ -632,8 +632,8 @@
else:
raise error.InterventionRequired(
_(
- b'unresolved conflicts (see hg '
- b'resolve, then hg rebase --continue)'
+ b"unresolved conflicts (see 'hg "
+ b"resolve', then 'hg rebase --continue')"
)
)
if not self.collapsef:
--- a/tests/test-absorb-unfinished.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-absorb-unfinished.t Mon Jul 13 16:42:44 2020 -0700
@@ -20,7 +20,7 @@
rebasing 1:c3b6dc0e177a "foo 2" (tip)
merging foo.whole
warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg --config extensions.rebase= absorb
--- a/tests/test-bookmarks-rebase.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-bookmarks-rebase.t Mon Jul 13 16:42:44 2020 -0700
@@ -80,7 +80,7 @@
rebasing 4:dd7c838e8362 "4" (three tip)
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg rebase --abort
rebase aborted
@@ -95,7 +95,7 @@
rebasing 4:dd7c838e8362 "4" (three tip)
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg bookmark -d three
$ hg rebase --abort
--- a/tests/test-copytrace-heuristics.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-copytrace-heuristics.t Mon Jul 13 16:42:44 2020 -0700
@@ -91,7 +91,7 @@
file 'a' was deleted in local [dest] but was modified in other [source].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ cd ..
@@ -248,7 +248,7 @@
file 'a' was deleted in local [dest] but was modified in other [source].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg rebase --abort
@@ -710,7 +710,7 @@
file 'a' was deleted in local [dest] but was modified in other [source].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
But when we have "sourcecommitlimit > (no. of drafts from base to c1)", we do
--- a/tests/test-fix.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-fix.t Mon Jul 13 16:42:44 2020 -0700
@@ -868,7 +868,7 @@
rebasing 1:c3b6dc0e177a "foo 2" (tip)
merging foo.whole
warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg --config extensions.rebase= fix --working-dir
--- a/tests/test-largefiles-update.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-largefiles-update.t Mon Jul 13 16:42:44 2020 -0700
@@ -593,7 +593,7 @@
what do you want to do? o
merging normal1
warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ cat .hglf/large1
58e24f733a964da346e2407a2bee99d9001184f5
--- a/tests/test-merge-halt.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-merge-halt.t Mon Jul 13 16:42:44 2020 -0700
@@ -27,7 +27,7 @@
merging b
merging a failed!
merging b failed!
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg resolve --list
--- a/tests/test-narrow-rebase.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-narrow-rebase.t Mon Jul 13 16:42:44 2020 -0700
@@ -72,7 +72,7 @@
$ hg rebase -d 'desc("modify inside/f1")' 2>&1 | egrep -v '(warning:|incomplete!)'
rebasing 6:cdce97fbf653 "conflicting inside/f1" (tip)
merging inside/f1
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
$ echo modified3 > inside/f1
$ hg resolve -m 2>&1 | grep -v continue:
(no more unresolved files)
--- a/tests/test-rebase-abort.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-rebase-abort.t Mon Jul 13 16:42:44 2020 -0700
@@ -81,7 +81,7 @@
rebasing 4:46f0b057b5c0 "L2" (tip)
merging common
warning: conflicts while merging common! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
Insert unsupported advisory merge record:
@@ -148,7 +148,7 @@
rebasing 4:46f0b057b5c0 "L2" (tip)
merging common
warning: conflicts while merging common! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ mv .hg/rebasestate .hg/rebasestate.back
@@ -218,7 +218,7 @@
rebasing 4:145842775fec "C1" (tip)
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg tglog
@@ -277,7 +277,7 @@
rebasing 3:6c0f977a22d8 "C" (foo tip)
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg abort
rebase aborted
@@ -315,7 +315,7 @@
$ hg rebase -d @ -b foo --tool=internal:fail
rebasing 2:070cf4580bb5 "b2" (foo tip)
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ mv .hg/rebasestate ./ # so we're allowed to hg up like in mercurial <2.6.3
@@ -462,7 +462,7 @@
$ hg rebase -d 1 --tool 'internal:fail'
rebasing 2:e4ea5cdc9789 "conflicting 1"
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg abort
rebase aborted
@@ -503,7 +503,7 @@
$ hg rebase -d 'public()' --tool :merge -q
note: not rebasing 3:0682fd3dabf5 "disappear draft", its destination already has all its changes
warning: conflicts while merging root! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg abort
rebase aborted
--- a/tests/test-rebase-backup.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-rebase-backup.t Mon Jul 13 16:42:44 2020 -0700
@@ -126,7 +126,7 @@
rebasing 6:f8bc7d28e573 "c"
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg rebase --abort
saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/818c1a43c916-2b644d96-backup.hg
@@ -142,7 +142,7 @@
rebasing 6:f8bc7d28e573 "c"
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg rebase --abort
rebase aborted
--- a/tests/test-rebase-bookmarks.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-rebase-bookmarks.t Mon Jul 13 16:42:44 2020 -0700
@@ -172,7 +172,7 @@
rebasing 3:3d5fa227f4b5 "C" (Y Z)
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ echo 'c' > c
$ hg resolve --mark c
--- a/tests/test-rebase-check-restore.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-rebase-check-restore.t Mon Jul 13 16:42:44 2020 -0700
@@ -69,7 +69,7 @@
rebasing 2:965c486023db "C"
merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
Solve the conflict and go on:
@@ -126,7 +126,7 @@
rebasing 5:01e6ebbd8272 "F" (tip)
merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
Solve the conflict and go on:
--- a/tests/test-rebase-collapse.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-rebase-collapse.t Mon Jul 13 16:42:44 2020 -0700
@@ -291,7 +291,7 @@
file 'E' was deleted in local [dest] but was modified in other [source].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ echo F > E
@@ -658,7 +658,7 @@
rebasing 1:81e5401e4d37 "B" (B)
merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ rm A.orig
$ hg resolve --mark A
@@ -705,7 +705,7 @@
rebasing 1:f899f3910ce7 "B" (B)
merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg tglog
o 3: 63668d570d21 'C'
@@ -733,7 +733,7 @@
rebasing 3:63668d570d21 "C" (C tip)
merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg tglog
% 3: 63668d570d21 'C'
--- a/tests/test-rebase-conflicts.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-rebase-conflicts.t Mon Jul 13 16:42:44 2020 -0700
@@ -66,7 +66,7 @@
rebasing 4:46f0b057b5c0 "L2"
merging common
warning: conflicts while merging common! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg status --config commands.status.verbose=1
@@ -344,7 +344,7 @@
rebasing 13:7bc217434fc1 "abc" (tip)
merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg diff
diff -r 328e4ab1f7cc a
@@ -364,7 +364,7 @@
rebasing 13:7bc217434fc1 "abc" (tip)
merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg diff
diff -r 328e4ab1f7cc a
@@ -402,7 +402,7 @@
rebasing 1:112478962961 "B" (B)
merging B
warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ echo 4 > B
@@ -454,7 +454,7 @@
rebasing 5:9a6b91dc2044 "F" (F tip)
merging conflict
warning: conflicts while merging conflict! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg tglog
@ 8:draft 'E'
--- a/tests/test-rebase-dest.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-rebase-dest.t Mon Jul 13 16:42:44 2020 -0700
@@ -48,7 +48,7 @@
rebasing 3:0537f6b50def "dc" (tip)
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ echo d > c
$ hg resolve --mark --all
--- a/tests/test-rebase-detach.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-rebase-detach.t Mon Jul 13 16:42:44 2020 -0700
@@ -297,7 +297,7 @@
rebasing 3:17b4880d2402 "B2" (tip)
merging B
warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg resolve --all -t internal:local
(no more unresolved files)
--- a/tests/test-rebase-inmemory.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-rebase-inmemory.t Mon Jul 13 16:42:44 2020 -0700
@@ -471,7 +471,7 @@
rebasing 4:e860deea161a "e"
merging e
warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg rebase --abort
saved backup bundle to $TESTTMP/repo3/.hg/strip-backup/c1e524d4287c-f91f82e1-backup.hg
@@ -863,7 +863,7 @@
rebasing 2:fb62b706688e "add b to foo" (tip)
merging foo
warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ cd $TESTTMP
@@ -897,7 +897,7 @@
rebasing 2:b4d249fbf8dd "bye from foo"
merging foo
warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg rebase -r 3 -d 1 -t:merge3
abort: rebase in progress
--- a/tests/test-rebase-interruptions.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-rebase-interruptions.t Mon Jul 13 16:42:44 2020 -0700
@@ -61,7 +61,7 @@
rebasing 2:965c486023db "C"
merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
Force a commit on C during the interruption:
@@ -98,7 +98,7 @@
rebasing 2:965c486023db "C"
merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
Solve the conflict and go on:
@@ -157,7 +157,7 @@
rebasing 2:965c486023db "C"
merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
Force a commit on B' during the interruption:
@@ -229,7 +229,7 @@
rebasing 2:965c486023db "C"
merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
Change phase on B and B'
@@ -302,7 +302,7 @@
rebasing 2:965c486023db "C"
merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg tglog
@ 5: 45396c49d53b 'B'
@@ -505,7 +505,7 @@
rebasing 1:fdaca8533b86 "b"
merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ echo a > a
$ echo c >> a
@@ -525,7 +525,7 @@
rebasing 2:fdaca8533b86 "b" (tip)
merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ echo a > a
$ echo c >> a
--- a/tests/test-rebase-mq-skip.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-rebase-mq-skip.t Mon Jul 13 16:42:44 2020 -0700
@@ -155,7 +155,7 @@
rebasing 3:6ff5b8feed8e "r3" (r3)
note: not rebasing 3:6ff5b8feed8e "r3" (r3), its destination already has all its changes
rebasing 4:094320fec554 "r4" (r4)
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ HGMERGE=internal:local hg resolve --all
--- a/tests/test-rebase-mq.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-rebase-mq.t Mon Jul 13 16:42:44 2020 -0700
@@ -62,7 +62,7 @@
rebasing 2:3504f44bffc0 "P0" (f.patch qbase)
merging f
warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
Fix the 1st conflict:
@@ -76,7 +76,7 @@
rebasing 3:929394423cd3 "P1" (f2.patch qtip tip)
merging f
warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
Fix the 2nd conflict:
--- a/tests/test-rebase-obsolete.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-rebase-obsolete.t Mon Jul 13 16:42:44 2020 -0700
@@ -1032,7 +1032,7 @@
rebasing 19:b82fb57ea638 "willconflict second version"
merging willconflict
warning: conflicts while merging willconflict! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg resolve --mark willconflict
@@ -1787,7 +1787,7 @@
rebasing 1:2ec65233581b "B"
merging D
warning: conflicts while merging D! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ cp -R . $TESTTMP/hidden-state2
@@ -1872,7 +1872,7 @@
rebasing 3:055a42cdd887 "d"
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg rebase --stop
1 new orphan changesets
@@ -1934,7 +1934,7 @@
rebasing 3:055a42cdd887 "d"
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg rebase --stop
abort: cannot remove original changesets with unrebased descendants
@@ -1952,7 +1952,7 @@
rebasing 3:055a42cdd887 "d"
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg rebase --stop
$ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n"
@@ -2014,7 +2014,7 @@
rebasing 3:055a42cdd887 "d"
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg rebase --stop
abort: cannot stop in --collapse session
@@ -2047,7 +2047,7 @@
rebasing 3:055a42cdd887 "d"
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg rebase --stop --dry-run
abort: cannot specify both --stop and --dry-run
@@ -2115,7 +2115,7 @@
rebasing 3:67a385d4e6f2 "D" (Z)
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg rebase --stop
1 new orphan changesets
--- a/tests/test-rebase-parameters.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-rebase-parameters.t Mon Jul 13 16:42:44 2020 -0700
@@ -479,7 +479,7 @@
$ hg rebase -s 2 -d 1 --tool internal:fail
rebasing 2:e4e3f3546619 "c2b" (tip)
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg summary
--- a/tests/test-rebase-partial.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-rebase-partial.t Mon Jul 13 16:42:44 2020 -0700
@@ -84,7 +84,7 @@
rebasing 2:ef8c0fe0897b "D" (D)
merging file
warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg rebase --abort
rebase aborted
--- a/tests/test-rebase-transaction.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-rebase-transaction.t Mon Jul 13 16:42:44 2020 -0700
@@ -107,7 +107,7 @@
rebasing 3:c26739dbe603 "C" (C)
merging conflict
warning: conflicts while merging conflict! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg tglog
o 5: D
--- a/tests/test-resolve.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-resolve.t Mon Jul 13 16:42:44 2020 -0700
@@ -520,7 +520,7 @@
warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')
warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
Test when commands.resolve.confirm config option is not set:
--- a/tests/test-sparse-profiles.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-sparse-profiles.t Mon Jul 13 16:42:44 2020 -0700
@@ -200,7 +200,7 @@
merging data.py
warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark')
warning: conflicts while merging data.py! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ rm *.orig
$ ls -A
--- a/tests/test-sparse.t Wed Apr 01 08:42:00 2020 -0500
+++ b/tests/test-sparse.t Mon Jul 13 16:42:44 2020 -0700
@@ -200,7 +200,7 @@
temporarily included 2 file(s) in the sparse checkout for merging
merging hide
warning: conflicts while merging hide! (edit, then use 'hg resolve --mark')
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]
$ hg debugsparse