[Updated] D12107: merge: break up a not-so-one-liner for readability

[marmoute (Pierre-Yves David)]

Closed by commit rHG58a2c66fa94c: merge: break up a not-so-one-liner for readability (authored by marmoute).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D12107?vs=32003&id=32065

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D12107/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D12107

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1922,13 +1922,9 @@
                 hint = _(b"use 'hg resolve' to resolve")
                 raise error.StateError(msg, hint=hint)
         if branchmerge:
+            m_a = _(b"merging with a working directory ancestor has no effect")
             if pas == [p2]:
-                raise error.Abort(
-                    _(
-                        b"merging with a working directory ancestor"
-                        b" has no effect"
-                    )
-                )
+                raise error.Abort(m_a)
             elif pas == [p1]:
                 if not mergeancestor and wc.branch() == p2.branch():
                     raise error.Abort(



To: marmoute, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20220204/c95f3c44/attachment-0002.html>