[Bug 3504] New: rebase appears to include changes outside of specified range

bugzilla-daemon at bz.selenic.com bugzilla-daemon at bz.selenic.com
Mon Jun 18 16:43:41 CDT 2012


http://bz.selenic.com/show_bug.cgi?id=3504

          Priority: normal
            Bug ID: 3504
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: rebase appears to include changes outside of specified
                    range
          Severity: bug
    Classification: Unclassified
                OS: Windows
          Reporter: daniel.atallah at gmail.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: 2.2.1
         Component: Mercurial
           Product: Mercurial

There's no component for "rebase"; so I've chosen "Mercurial" instead.

This is actually with Mercurial 2.2.2 (2.2.1 is the latest version in the
"Version" selection):
$ hg --version
Mercurial Distributed SCM (version 2.2.2)

The following steps can be followed to recreate the issue:

hg clone -U http://hg.pidgin.im/soc/2012/sanket/statscollector/
sanket-statscollector
cd sanket-statscollector
hg pull -b release-2.x.y http://hg.pidgin.im/pidgin/main/
hg up release-2.x.y
hg --config extensions.rebase= rebase -r "1188c594e2eb::076fa506889d"
--keepbranches --keep

At this point, you'll see that there are conflicts in ChangeLog, but ChangeLog
wasn't modified in that range:
hg log -r "1188c594e2eb::076fa506889d and file('ChangeLog')"

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


More information about the Mercurial-devel mailing list