Patchwork [Bug,5965] New: word-diff sometimes not helpful

login
register
mail settings
Submitter mercurial-bugs@mercurial-scm.org
Date Aug. 20, 2018, 10:11 p.m.
Message ID <bug-5965-285@https.bz.mercurial-scm.org/>
Download mbox | patch
Permalink /patch/33922/
State Not Applicable
Headers show

Comments

mercurial-bugs@mercurial-scm.org - Aug. 20, 2018, 10:11 p.m.
https://bz.mercurial-scm.org/show_bug.cgi?id=5965

            Bug ID: 5965
           Summary: word-diff sometimes not helpful
           Product: Mercurial
           Version: default branch
          Hardware: PC
                OS: Linux
            Status: UNCONFIRMED
          Severity: feature
          Priority: wish
         Component: Mercurial
          Assignee: bugzilla@mercurial-scm.org
          Reporter: martinvonz@google.com
                CC: mercurial-devel@mercurial-scm.org

One of my commits had this diff (the parent commit is also private, so this
patch won't apply in your repo in case you decided to try):


Word-diff decided to mark only "this" and "cause" (and the TODO line) as
preserved from the base and everything else is marked as changed. That seems
more confusing than helpful. I don't know what the right solution is, but it
seems clear it needs some tweaking.

Patch

--- a/tests/test-rebase-obsolete.t
+++ b/tests/test-rebase-obsolete.t
@@ -1508,11 +1508,9 @@  destination
   > A
   > EOF

-TODO: There doesn't seem to be much reason to fail this rebase. Make it pass?
   $ hg rebase -d D -s B
-  abort: this rebase will cause divergences from: 26805aba1e60
-  (to force the rebase please set experimental.evolution.allowdivergence=True)
-  [255]
+  rebasing 1:112478962961 "B" (B)
+  note: not rebasing 3:26805aba1e60 "C" (C) and its descendants as this would
cause divergence

   $ cd ..