[Bug 4305] New: hg annotate after rebase shows obsolete changeset

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Wed Jul 16 09:10:18 CDT 2014


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

          Priority: normal
            Bug ID: 4305
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: hg annotate after rebase shows obsolete changeset
          Severity: bug
    Classification: Unclassified
                OS: Linux
          Reporter: lars.westerhoff at newtec.eu
          Hardware: PC
            Status: UNCONFIRMED
           Version: 3.0.2
         Component: evolution
           Product: Mercurial

Created attachment 1779
  --> http://bz.selenic.com/attachment.cgi?id=1779&action=edit
Test script showing bug

With obsolete markers enabled, when rebasing commits with changes to files that
have not been changed in the destination, a "hg annotate" of those files shows
the obsolete changeset as origin instead of the non-obsolete successor (see
attached test for details).

>From my understanding, this is because both the obsolete and the non-obsolete
changeset refer to the same file revision, which has the linkrev set to the
originating (obsolete) changeset.

I think, in the case where "hg annotate" encounters an obsolete changeset it
should follow the successor chain to the first non-obsolete changeset (at least
in a non-divergent situation).

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


More information about the Mercurial-devel mailing list