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.
merge: don't indent "local changed %s which remote deleted" prompt
authorMads Kiilerich <madski@unity3d.com>
Mon, 04 Feb 2013 02:46:53 +0100
changeset 18543 c8ba98bf0e71
parent 18542 46be5c9dac91
child 18544 d0a8f09a22eb
merge: don't indent "local changed %s which remote deleted" prompt It was usually not shown in a context where indentation helped readability and it was inconsistent with other prompts.
mercurial/merge.py file | annotate | diff | comparison | revisions
tests/test-merge-prompt.t file | annotate | diff | comparison | revisions
tests/test-rename-merge2.t file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Mon Feb 04 02:46:38 2013 +0100
+++ b/mercurial/merge.py	Mon Feb 04 02:46:53 2013 +0100
@@ -298,7 +298,7 @@
     for f, m in sorted(prompts):
         if m == "cd":
             if repo.ui.promptchoice(
-                _(" local changed %s which remote deleted\n"
+                _("local changed %s which remote deleted\n"
                   "use (c)hanged version or (d)elete?") % f,
                 (_("&Changed"), _("&Delete")), 0):
                 act("prompt delete", "r", f)
--- a/tests/test-merge-prompt.t	Mon Feb 04 02:46:38 2013 +0100
+++ b/tests/test-merge-prompt.t	Mon Feb 04 02:46:53 2013 +0100
@@ -42,7 +42,7 @@
 Non-interactive merge:
 
   $ hg merge -y
-   local changed file1 which remote deleted
+  local changed file1 which remote deleted
   use (c)hanged version or (d)elete? c
   remote changed file2 which local deleted
   use (c)hanged version or leave (d)eleted? c
@@ -70,7 +70,7 @@
   > c
   > d
   > EOF
-   local changed file1 which remote deleted
+  local changed file1 which remote deleted
   use (c)hanged version or (d)elete? remote changed file2 which local deleted
   use (c)hanged version or leave (d)eleted? 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
@@ -97,11 +97,11 @@
   > baz
   > c
   > EOF
-   local changed file1 which remote deleted
+  local changed file1 which remote deleted
   use (c)hanged version or (d)elete? unrecognized response
-   local changed file1 which remote deleted
+  local changed file1 which remote deleted
   use (c)hanged version or (d)elete? unrecognized response
-   local changed file1 which remote deleted
+  local changed file1 which remote deleted
   use (c)hanged version or (d)elete? remote changed file2 which local deleted
   use (c)hanged version or leave (d)eleted? unrecognized response
   remote changed file2 which local deleted
@@ -126,7 +126,7 @@
   $ hg merge --config ui.interactive=true <<EOF
   > d
   > EOF
-   local changed file1 which remote deleted
+  local changed file1 which remote deleted
   use (c)hanged version or (d)elete? remote changed file2 which local deleted
   use (c)hanged version or leave (d)eleted? abort: response expected
   [255]
--- a/tests/test-rename-merge2.t	Mon Feb 04 02:46:38 2013 +0100
+++ b/tests/test-rename-merge2.t	Mon Feb 04 02:46:53 2013 +0100
@@ -617,7 +617,7 @@
   resolving manifests
    overwrite: False, partial: False
    ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a
-   local changed a which remote deleted
+  local changed a which remote deleted
   use (c)hanged version or (d)elete? c
    a: prompt keep -> a
    b: versions differ -> m
Mercurial