[issue2471] rebase brought in some unrelated changes

[Ted Mielczarek]

New submission from Ted Mielczarek <ted at mielczarek.org>:

I had an applied patch in my mq with changes to two files. I ran a "hg pull
--rebase" to get up-to-date with upstream changes:
luser at cuatro:~/build/mozilla-central$ hg pull --rebase
pulling from http://hg.mozilla.org/mozilla-central
searching for changes
adding changesets
adding manifests
adding file changes
added 327 changesets with 2672 changes to 2652 files (+2 heads)
saved backup bundle to
/mnt/ssd/mozilla-central/.hg/strip-backup/c613fcbdc37f-backup.hg

Nothing untoward in the output, no merge tool launched. I then pushed the
changeset to the mozilla-central repository, only to find that it included
changes to a number of unrelated files:
http://hg.mozilla.org/mozilla-central/rev/ed88ab5f4dbf

The original patch looked like:
https://bug607946.bugzilla.mozilla.org/attachment.cgi?id=486606

This is using:
Mercurial Distributed SCM (version 1.6.4+212-01145ee78c53)

Looking at the hg log for some of the files, it looks like the files were
renamed a few times (by landing and backing out the rename patch), and were
merged into mozilla-central.

----------
messages: 14265
nosy: ted.mielczarek
priority: bug
status: unread
title: rebase brought in some unrelated changes

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2471>
____________________________________________________