Skip to content

GitLab

  • Menu
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
  • Monitor
    • Monitor
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • mercurial
  • TortoiseHg
  • thgthg
  • Issues
  • #2147

Closed
Open
Created Sep 13, 2012 by Bitbucket Importer@bitbucket_importerOwner

BeyondCompare: Wrong 3-way diff for automatic merges

Created originally on Bitbucket by Gili

Reproduced in TortoiseHg 2.4.3

Bare with me. This bug is easy to reproduce but the explanation is a bit long :)

  1. From TortoiseHg Workbench, select a revision to merge against.
  2. The target revision should contain a single file that has changed in a manner that can be merged automatically.
  3. "Merge with Local"
  4. "1 files were modified on both branches and must be resolved". Click on "resolved"
  5. Select the single file, and click on "Tool resolve". The file will get resolved without any interaction and move to the bottom window.
  6. Select the resolved file in the bottom window, then click on 3-way diff.
  7. BeyondCompare is launched with the following arguments: "bcompare /tmp/thg.Ic6pW8/empty /tmp/thg.Ic6pW8/.../newRevision/file.txt /tmp/thg.Ic6pW8/.../oldRevision/file.txt"
  8. The BeyondCompare window is split into three: empty, "file.txt[merged]", "file.txt@newReviison"

Expected behavior: left tab should contain one revision, the middle tab should contain the "base" revision, the right tab should contain the other revision.

This is reproducible always.

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