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 798
    • Issues 798
    • 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
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar

There will be about 1h of downtime on 2020-03-02 at 13:00 UTC+1 (change of servers and upgrade to Heptapod 0.20.0 final)

  • mercurial
  • TortoiseHg
  • thgthg
  • Issues
  • #5555

Closed
Open
Opened Jun 18, 2020 by Bitbucket Importer@bitbucket_importerOwner

TortoiseHG commits unchecked chunks between the merge wizard finishing and committing by hand

Created originally on Bitbucket by gmb1226 (Greg Besack)

Today while merging, I found a line of code I wanted to back out of the merge commit that wasn't available to change as part of the conflict resolution window. It was a bit of debug code left in. So after the merge wizard finished, I did a “Commit Later” so I could change it before the merge.

I clicked on the offending source file, and unchecked the code chunk. Then I clicked commit to finalize the merge.

When I viewed the resulting merge, this chunk was still included in the merge, even though I unchecked it.

I expected the chunk to be excluded from the merge commit and left in the stating area.

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