Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • thg thg
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 838
    • Issues 838
    • List
    • Boards
    • Service Desk
    • Milestones
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • mercurialmercurial
  • TortoiseHgTortoiseHg
  • thgthg
  • Issues
  • #4063
Closed
Open
Issue created Feb 26, 2015 by Bitbucket Importer@bitbucket_importerOwner

'show changes from second parent' doesn't work on an uncommited merge

Created originally on Bitbucket by Anonymous

When starting a merge of two revisions, and pressing the button 'commit later' in the merge dialog, the working directory has 2 parents. In this state, the GUI have 2 buttons designed to show the 'diff' from parent 1 & parent 2 When choosing the working directory and pressing the button to show the diff from parent 2, it shows instead the diff from parent 1.

After the merge is committed, the buttons behave as expected.

I attached images to present the issue on '1.png', the '1' button is pressed and the correct diff is shown below on '2.png', the '2' button is pressed and the same diff (as '1') is shown below on 'after merge 2.png', the '2' button is pressed and the correct diff is shown below

It is easy to replicate this using a new repository. On one file, create a change & commit, roll-back before the change, create a different change & commit, try to merge the 2 commits but press 'commit later' on the last merge dialog.

Attachments: 12after_merge_2

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking