------------------------------------------------------------------------------ To reply, visit https://hellosplat.com/s/beanbag/tickets/4555/ ------------------------------------------------------------------------------
New ticket #4555 by totoroliu For Beanbag, Inc. > RBTools Status: New Tags: Priority:Medium, Type:Defect File attachments: * _progress_CRLF.scss <https://hellosplat.com/s/beanbag/attachments/1247/> * _progress_LF.scss <https://hellosplat.com/s/beanbag/attachments/1248/> ------------------------------------------------------------------------------ rbt diff is different from svn diff on Windows platform when there's line ending difference ============================================================================== # What version are you running? RBTools 0.7.10 svn, version 1.9.5 (r1770682) diff (GNU diffutils) 2.8.7 Windows 10 Pro 64-bit # What steps will reproduce the problem? 1. Under SVN, prepare a text fileA with Linux line-ending (LF) and commit. 2. Change fileA Linux line-ending (LF) to Windows line-ending (CRLF) 3. svn diff would show each line is different 4. rbt diff would show diff header only without content difference # What is the expected output? What do you see instead? rbt diff should produce the same diff output as svn diff # What operating system are you using? Windows 10 Pro 64-bit # Attach the debug out from the command. ``` components> svn diff Index: _progress.scss =================================================================== --- _progress.scss (revision 52283) +++ _progress.scss (working copy) @@ -1,17 +1,17 @@ -@charset "UTF-8"; - -.progress.progress-labelled { - position: relative; - width: 100%; - height: 20px; - margin-bottom: 0; - text-align: center; - - .progress-bar { - position: absolute; - top: 0; - left: 0; - overflow: hidden; - color: $forti-text-default-invert; - } -} +@charset "UTF-8"; + +.progress.progress-labelled { + position: relative; + width: 100%; + height: 20px; + margin-bottom: 0; + text-align: center; + + .progress-bar { + position: absolute; + top: 0; + left: 0; + overflow: hidden; + color: $forti-text-default-invert; + } +} components>rbt diff Index: /components/_progress.scss (added) =================================================================== --- /components/_progress.scss (revision 0) +++ /components/_progress.scss (revision 0) components>rbt diff --debug >>> RBTools 0.7.10 >>> Python 2.7.13 (v2.7.13:a06454b1afa1, Dec 17 2016, 20:42:59) [MSC v.1500 32 >>> bit (Intel)] >>> Running on Windows-10-10.0.14393 >>> Home = C:\Users\ricklilu\AppData\Roaming >>> Current directory = C:\components >>> Command line: rbt diff --debug >>> Running: tf vc help >>> Checking for a Subversion repository... >>> Running: svn --non-interactive info >>> Running: diff --version >>> Running: svn --non-interactive --version -q >>> repository info: Path: http://scm-yvr.fortinet.com/svn/svnfct, Base path: >>> /components, Supports changesets: False >>> Making HTTP GET request to http://reviewboard.corp.fortinet.com/api/ >>> Running: svn --non-interactive info >>> Running: diff --version >>> Running: svn --non-interactive --version -q >>> repository info: Path: http://scm-yvr.fortinet.com/svn/svnfct, Base path: >>> /components, Supports changesets: False >>> Running: svn --non-interactive status -q --ignore-externals >>> Running: svn --non-interactive diff --diff-cmd=diff --notice-ancestry -r >>> BASE >>> Running: svn --non-interactive diff --diff-cmd=diff --notice-ancestry -r >>> BASE --no-diff-deleted >>> Running: svn --non-interactive info _progress.scss >>> Running: svn --non-interactive info _progress.scss >>> Running: svn --non-interactive info _progress.scss Index: /components/_progress.scss (added) =================================================================== --- /components/_progress.scss (revision 0) +++ /components/_progress.scss (revision 0) ``` # Please provide any additional information below. ------------------------------------------------------------------------------ -- You received this message because you are subscribed to the Google Groups "reviewboard-issues" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at https://groups.google.com/group/reviewboard-issues. For more options, visit https://groups.google.com/d/optout.
