[Bug 5415] New: Unexpected merge result ignored changes in p2 branch

[bugzilla at mercurial-scm.org]

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

            Bug ID: 5415
           Summary: Unexpected merge result ignored changes in p2 branch
           Product: Mercurial
           Version: 4.0
          Hardware: All
                OS: All
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: Mercurial
          Assignee: bugzilla at selenic.com
          Reporter: gregory.szorc at gmail.com
                CC: mercurial-devel at selenic.com

(This issue initially reported at
https://bugzilla.mozilla.org/show_bug.cgi?id=1315227)

STR:

  $ hg clone -r 38fcc30d818f https://hg.mozilla.org/mozilla-central
  $ cd mozilla-central
  $ hg pull -r 964223d37a2e https://hg.mozilla.org/integration/mozilla-inbound
  $ hg merge 964223d37a2e 
  $ hg commit -m merge

dad84422bcfc (an ancestor of 38fcc30d818f - the future p1 of the merge)
introduces "bad" content.

325acea6a61c (an ancestor of 964223d37a2e - the future p2 of the merge) is a
revert of dad84422bcfc.

At the end of the merge, browser/base/content/browser.js contains "bad" content
despite that content being removed in the p2 branch.

Graphically:

o  changeset:   320907:964223d37a2e
:  tag:         tip
:  user:        Jonathan Kingston <jkt at mozilla.com>
:  date:        Thu Nov 03 19:31:35 2016 +0100
:  summary:     Bug 1267916 - part 2 - Add in UX for
about:preferences#containers page, r=jaws
:
o  changeset:   320869:325acea6a61c
:  user:        Dão Gottwald <dao at mozilla.com>
:  date:        Thu Nov 03 11:55:04 2016 +0100
:  summary:     Backed out changeset dad84422bcfc (bug 1300376)
:
: @  changeset:   320810:38fcc30d818f
:/   parent:      320736:3b80868f7a8f
:    parent:      320809:fa679b6eced2
:    user:        Phil Ringnalda <philringnalda at gmail.com>
:    date:        Thu Nov 03 19:24:04 2016 -0700
:    summary:     Merge autoland to m-c, a=merge
:
o  changeset:   320434:dad84422bcfc
|  user:        Jared Wein <jwein at mozilla.com>
~  date:        Tue Nov 01 15:25:06 2016 -0400
   summary:     Bug 1300376 - Update the zoom indicator status on
XULBrowserWindow location changes to catch cases where the indicator wasn't
getti

Somehow the content from dad84422bcfc is surviving the changes to it in
325acea6a61c despite dad84422bcfc being an ancestor of the merge's p1 and p2.
This feels wrong.

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