Jump to content

A bug in p4 merge

  • Please log in to reply
No replies to this topic

#1 victorbradford



  • Members
  • Pip
  • 1 posts

Posted 07 January 2020 - 12:23 PM

If one selects to ignore all blanks, line endings, etc, when doing a p4 diff against have revision, lines that differ only by such blank spaces aren't shown correctly.

I edited one file, and in addition to some real changes, I deleted some extra spaces in e.g. function calls, to make func (arg1, ...) be func(arg1 ...)

Interestingly enough, those lines show in the workspace file pane not what the workspace file has, but show the same as in the have revision pane.

I did a double take, wondering whether I had saved the file since my last edit.

0 user(s) are reading this topic

0 members, 0 guests, 0 anonymous users