Skip to content
GitLab
    • GitLab: the DevOps platform
    • Explore GitLab
    • Install GitLab
    • How GitLab compares
    • Get started
    • GitLab docs
    • GitLab Learn
  • Pricing
  • Talk to an expert
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
    Projects Groups Topics Snippets
  • Register
  • Sign in
  • TortoiseGit TortoiseGit
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
    • Locked files
  • Issues 382
    • Issues 382
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 16
    • Merge requests 16
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test cases
  • Deployments
    • Deployments
    • Releases
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • TortoiseGitTortoiseGit
  • TortoiseGitTortoiseGit
  • Issues
  • #2545
Closed
Open
Issue created Aug 02, 2015 by Sven Strickroth@mrtuxOwner

Incorrect TortiseGitMerge behaivor when ignore comments is on

By bpspec... on July 28, 2015 10:51 (imported from Google Code)


What steps will reproduce the problem?

  1. commit c# file with line like What steps will reproduce the problem?
  2. commit c# file with line like string url = @"http://some.domain";What steps will reproduce the problem?
  3. commit c# file with line like `string url = @"http://some.domain";
  4. change this line to What steps will reproduce the problem?
  5. commit c# file with line like string url = @"http://some.domain";
  6. change this line to string url = @"http://www.some.domain";What steps will reproduce the problem?
  7. commit c# file with line like string url = @"http://some.domain";
  8. change this line to `string url = @"http://www.some.domain";
  9. try to see changes between new and commited files in TortiseGitMerge and set ignore comments to on

What is the expected output? What do you see instead?

TortiseGitMerge should ignore What steps will reproduce the problem?

  1. commit c# file with line like string url = @"http://some.domain";
  2. change this line to string url = @"http://www.some.domain";
  3. try to see changes between new and commited files in TortiseGitMerge and set ignore comments to on

What is the expected output? What do you see instead?

TortiseGitMerge should ignore //What steps will reproduce the problem?

  1. commit c# file with line like string url = @"http://some.domain";
  2. change this line to string url = @"http://www.some.domain";
  3. try to see changes between new and commited files in TortiseGitMerge and set ignore comments to on

What is the expected output? What do you see instead?

TortiseGitMerge should ignore `// chars sequence inside string and show code changes. But TortiseGitMerge ignore any changes after What steps will reproduce the problem?

  1. commit c# file with line like string url = @"http://some.domain";
  2. change this line to string url = @"http://www.some.domain";
  3. try to see changes between new and commited files in TortiseGitMerge and set ignore comments to on

What is the expected output? What do you see instead?

TortiseGitMerge should ignore // chars sequence inside string and show code changes. But TortiseGitMerge ignore any changes after //What steps will reproduce the problem?

  1. commit c# file with line like string url = @"http://some.domain";
  2. change this line to string url = @"http://www.some.domain";
  3. try to see changes between new and commited files in TortiseGitMerge and set ignore comments to on

What is the expected output? What do you see instead?

TortiseGitMerge should ignore // chars sequence inside string and show code changes. But TortiseGitMerge ignore any changes after `//

What version of TortoiseGit and msysgit are you using? On
what operating system?
Windows 7 x64 Ultimate
TortoiseGit 1.8.9.0 (C:\Program Files\TortoiseGit\bin)
git version 1.9.4.msysgit.0 (C:\Program Files (x86)\Git\bin)

Please provide any additional information below.

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