------------------------------------------------------------------------------ To reply, visit https://hellosplat.com/s/beanbag/tickets/4546/ ------------------------------------------------------------------------------
New ticket #4546 by totoroliu For Beanbag, Inc. > RBTools Status: New Tags: Priority:Medium, Type:Defect ------------------------------------------------------------------------------ rbt diff is different from svn diff ============================================================================== # What version are you running? rbtools-0.7.9 # What steps will reproduce the problem? 1. prepare a test file below and commit into SVN: -- test line1 -- this line (test1) -- test lin2 -- test line (test2) 2. remove line#2: -- this line (test1) 3. svn diff would show: ``` $ svn diff Index: test =================================================================== --- test (revision 16006) +++ test (working copy) @@ -1,4 +1,3 @@ -- test line1 --- this line (test1) -- test lin2 -- test line (test2) ``` 4. rbt diff is incorrect and missing the line of change: ``` $ rbt diff Index: /TestProject/trunk/Test/folder/test =================================================================== --- /TestProject/trunk/Test/folder/test (revision 16006) +++ /TestProject/trunk/Test/folder/test (working copy) @@ -1,4 +1,3 @@ -- test line1 -- test lin2 -- test line (test2) ``` # What is the expected output? What do you see instead? rbt diff should be the same as svn diff, but there are missing lines and caused rbt patch failure. # What operating system are you using? Ubuntu 14.04.05 LTS # Attach the debug out from the command. ``` $ rbt diff --debug >>> RBTools 0.7.9 >>> Python 2.7.12 (default, Nov 19 2016, 06:48:10) [GCC 5.4.0 20160609] >>> Running on Linux-4.4.0-75-generic-x86_64-with-Ubuntu-16.04-xenial >>> Home = /home/rickliu >>> Current directory = /home/rickliu/scrach/TestProject_trunk/Test/folder >>> Command line: rbt diff --debug >>> 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/svntest, Base path: >>> /TestProject/trunk/Test/folder, Supports changesets: False >>> Making HTTP GET request to http://172.16.182.156/api/ >>> Running: svn --non-interactive info >>> Running: diff --version >>> Running: svn --non-interactive --version -q >>> repository info: Path: http://scm-yvr.fortinet.com/svn/svntest, Base path: >>> /TestProject/trunk/Test/folder, 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 info test >>> Running: svn --non-interactive diff --diff-cmd=diff --notice-ancestry -r >>> BASE --no-diff-deleted >>> Running: svn --non-interactive info test >>> Running: svn --non-interactive info test >>> Running: svn --non-interactive info test Index: /TestProject/trunk/Test/folder/test =================================================================== --- /TestProject/trunk/Test/folder/test (revision 16006) +++ /TestProject/trunk/Test/folder/test (working copy) @@ -1,4 +1,3 @@ -- test line1 -- test lin2 -- test line (test2) ``` # 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.
