Mercurial > hg
diff tests/test-copytrace-heuristics.t @ 39277:f785073f792c
merge: improve interactive one-changed one-deleted message (issue5550)
I like the wording from the bug, so I figured I'd package it up in a
change and see what people think.
Differential Revision: https://phab.mercurial-scm.org/D4336
author | Augie Fackler <augie@google.com> |
---|---|
date | Mon, 20 Aug 2018 13:29:48 -0400 |
parents | c829749e7639 |
children | 975d959295ef |
line wrap: on
line diff
--- a/tests/test-copytrace-heuristics.t Thu Aug 16 17:19:27 2018 +0200 +++ b/tests/test-copytrace-heuristics.t Mon Aug 20 13:29:48 2018 -0400 @@ -86,7 +86,8 @@ $ hg rebase -s . -d 1 rebasing 2:d526312210b9 "mode a" (tip) - other [source] changed a which local [dest] deleted + file a was deleted in other [source] but was modified in local [dest]. + What do you want to do? use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u unresolved conflicts (see hg resolve, then hg rebase --continue) [1] @@ -242,7 +243,8 @@ $ hg rebase -s 2 -d 1 --config experimental.copytrace.movecandidateslimit=0 rebasing 2:ef716627c70b "mod a" (tip) skipping copytracing for 'a', more candidates than the limit: 7 - other [source] changed a which local [dest] deleted + file a was deleted in other [source] but was modified in local [dest]. + What do you want to do? use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u unresolved conflicts (see hg resolve, then hg rebase --continue) [1] @@ -697,7 +699,8 @@ $ hg rebase -s 8b6e13696 -d . rebasing 1:8b6e13696c38 "added more things to a" - other [source] changed a which local [dest] deleted + file a was deleted in other [source] but was modified in local [dest]. + What do you want to do? use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u unresolved conflicts (see hg resolve, then hg rebase --continue) [1]