Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
thg
thg
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 790
    • Issues 790
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Incidents
    • Environments
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • mercurial
  • TortoiseHg
  • thgthg
  • Issues
  • #634

Closed
Open
Opened May 02, 2011 by Bitbucket Importer@bitbucket_importerOwner

Incorrect kdiff3 arguments during merge with no base

Created originally on Bitbucket by Anonymous

TO REPRODUCE: Create 2 disjoint repos and attempt to merge them with the "force" option. When resolving conflicts, kdiff3 will be launched with the following settings:

  • A =
  • B = parent1
  • C = parent2

Notice that there is no (A = base). This causes merge problems. A is blank, but its EOL encoding is set Unix, while B and C are set to DOS. Try merging the following files set as B and C in kdiff3 but leave A blank:

  • File B:

Line1 Line1

Line2 Line2

Line3 Line3

Line4 Line4

Line5 Line5

  • File C:

Line1 Line1

Line2 Line2

Line3 Line3

Line4 Line4

Line5 Line5

Files B and C differ only by a blank new line. Kdiff3 will create huge conflicts, where in fact it should create none. You might say, that this is a kdiff3 bug and not tortoisehg. However I am posting it as a bug here, because tortoisehg can fix it. When there is no base, kdiff3 should be executed in the following way:

  • A = parent1
  • B = parent2
  • C =

Attachments: SampleRepo.zip

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
None
Due date
None
Reference: mercurial/tortoisehg/thg#634