[Bug 6914] New: hg diff from rebase parents and/or three-way merge conflict markers during resolution

[mercurial-bugs at mercurial-scm.org]

https://bz.mercurial-scm.org/show_bug.cgi?id=6914

            Bug ID: 6914
           Summary: hg diff from rebase parents and/or three-way merge
                    conflict markers during resolution
           Product: Mercurial
           Version: 6.7.4
          Hardware: PC
                OS: NetBSD
            Status: UNCONFIRMED
          Severity: feature
          Priority: wish
         Component: rebase
          Assignee: bugzilla at mercurial-scm.org
          Reporter: mercurial-bugzilla at campbell.mumble.net
                CC: mercurial-devel at mercurial-scm.org
    Python Version: ---

I have two heads, say C and E:

A --> B --> C
       \
        `--> D --> E --> F


I want to rebase D->E->F on C, to linearize the history as:

A --> B --> C --> D' --> E' --> F'

So I run `hg update F' and `hg rebase -d C', but there is a conflict when
applying E.  I work on resolving the conflict, but I want to review what I have
done so far before `hg rebase --continue'.

How do I find:

(a) a diff from the new parent (D') to the working tree,
(b) a diff from the changeset being rebased (E) to the working tree, and
(c) a diff from the three-way merge -- including conflict markers -- of the new
parent (D') and the changeset being rebased (E) to the working tree?

I think `hg diff' gives (a).

I think, _if this were `hg merge'_, `hg diff --from "p1()"' and `hg diff --from
"p2()"' would give me (a) and (b).  But p1() and p2() don't appear to work in
`hg rebase'.

I'm not sure how to get (c) with a merge or with a rebase.  This would tell me
what I'm about to add to what Mercurial has figured out on its own, which might
be removal of conflict markers but might also be other changes to resolve
semantic conflicts that Mercurial didn't detect syntactically.

I searched through `hg help --verbose diff'`, `hg help --verbose rebase', `hg
help -e --verbose rebase', and `hg help --verbose revsets' but didn't find
anything.

-- 
You are receiving this mail because:
You are on the CC list for the bug.