Empty diff on merge revision

Issue #215 invalid
Former user created an issue

http://dl.dropbox.com/u/4486681/1.ZIP

Here is the sample repository that reproduces an issue. If we put a cursor on r3 (fe3230c0deb8ea7642447a1cdc6d409aab3cd914) - then there is no any files changed, thus we cannot see what have changed since previous revision r0.

Comments (4)

  1. Steve Borho

    Revision three is a relatively new Mercurial concept called a 'fast forward merge'. Even though you merged 2 with 0, only revision 2 is recorded as a parent because it did not take any content from revision 0.

    There is no hint to us that a merge even occurred. the effect is the same as:

    hg up 2
    hg branch default
    hg commit -m "Merge"
    

    As a workaround, you can select versions 0 and 3 and open the context menu and chose 'visual diff'

  2. Log in to comment