1. TortoiseHg
  2. TortoiseHg
  3. thg
  4. Issues
Issue #458 resolved

resolve: Show info about the "local" and "other" revisions

Angel Ezquerra
created an issue

I'd be great if in the resolve dialog there were some text describing which revision is "local" and which revision is "other". This could include the revision id and even the longsummary of the last commit message.

This would make it much easier to identify the revisions that you are merging.

Comments (2)

  1. Steve Borho

    resolve: show info about the "local" and "other" revisions (closes #458)

    This adds two csinfo widgets to the top of the resolve window, containing the information about the local and the other revisions of a merge.

    Note that the resolve window can be open even if we are in the middle of a merge between two revisions (e.g. when merging local changes during and update). In those cases the revision information is not trivial and for now it will simply not be displayed.


  2. Log in to comment