[Bug 5866] New: A rebase that does a file merge and produces no file diff is not elided

[mercurial-bugs at mercurial-scm.org]

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

            Bug ID: 5866
           Summary: A rebase that does a file merge and produces no file
                    diff is not elided
           Product: Mercurial
           Version: 4.6rc0
          Hardware: All
                OS: All
            Status: UNCONFIRMED
          Severity: bug
          Priority: normal
         Component: rebase
          Assignee: bugzilla at mercurial-scm.org
          Reporter: gregory.szorc at gmail.com
                CC: mercurial-devel at mercurial-scm.org

This /might/ be a regression in 4.6.

If I rebase a single changeset changing a single file onto a future changeset
that has unrelated file changes and the file merge algorithm kicks in and
produces a file that didn't change, an empty changeset (one with a commit
message abut no file changes) is produced.

I was able to reproduce this just now with my Firefox repo at
https://hg.mozilla.org/users/gszorc_mozilla.com/firefox with two discrete
inputs. (Try using clone --stream to pull in the hidden changesets.)

$ hg rebase -s 2cc5a196 -d 2d83e1843241
rebasing 471591:2cc5a196aae1 "Bug 1455708 - Find Python 3 in MozillaBuild,
require Python 3 everywhere; r?Build"
merging build/moz.configure/init.configure

$ hg export 
# HG changeset patch
# User Gregory Szorc <gps at mozilla.com>
# Date 1524253445 25200
#      Fri Apr 20 12:44:05 2018 -0700
# Node ID 92cf59cf1a479c2637a29b1510b87657cb96ab0a
# Parent  2d83e1843241d869a2fc5cf06f96d3af44c70e70
Bug 1455708 - Find Python 3 in MozillaBuild, require Python 3 everywhere;
r?Build

We previously did not require Python 3.5+ everywhere because we failed
to detect Python 3.5 on Windows in CI. That's because CI isn't using
start-shell.bat and it hasn't yet updated PATH to include
%MOZILLABUILD%\python3.

We shouldn't need to teach CI to have PATH contain everything in
MozillaBuild. This commit teaches moz.configure to automatically use
MozillaBuild's Python 3 if we're running in MozillaBuild.

Since we can now detect Python 3 everywhere in CI, we make Python 3.5+
required on all build configurations.

MozReview-Commit-ID: BwgWGeYMyPM


$ hg rebase -s 60c0ca0f -d 2d83e1843241
rebasing 471625:60c0ca0f0121 "Bug 1456326 - Trim some fat from decision image;
r?dustin"
note: rebase of 471625:60c0ca0f0121 created no changes to commit
rebasing 471626:3ac1b5fbd290 "Bug 1456326 - Bump version of decision image;
r?dustin"
note: rebase of 471626:3ac1b5fbd290 created no changes to commit
rebasing 471627:bcddc53e85a6 "Bug 1456326 - Use latest decision image for
decision task; r?dustin"
merging .taskcluster.yml

$ hg export 7cc6fc2f
# HG changeset patch
# User Gregory Szorc <gps at mozilla.com>
# Date 1524531682 25200
#      Mon Apr 23 18:01:22 2018 -0700
# Node ID 7cc6fc2fbf6fb4933091c9bec853efbe026d77ae
# Parent  2d83e1843241d869a2fc5cf06f96d3af44c70e70
Bug 1456326 - Use latest decision image for decision task; r?dustin

As part of this we also change the cache name to ensure that
the new image uses a separate cache from the old image.

MozReview-Commit-ID: J4DmgupnyS

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