3972: Patch for moved file did not apply cleanly


What version are you running?


What's the URL of the page containing the problem?

Creating a new review request.

What steps will reproduce the problem?

  1. create diff using svn command line.
  2. create new review request and upload patch to reviewboard.
  3. view diff. 2 files fail to appear:
    The patch to 'trunk/product/src/spark-query-engine/src/java/com/actional/spark/query/guice/QueryEngineGuiceBundle.java' didn't apply cleanly. The temporary files have been left in '/tmp/reviewboard.3wU_dl' for debugging purposes.

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

Reviewboard would be able to properly apply the patch.

What operating system are you using? What browser?

reviewboard is running on latest version of amazon linux.
tested generating the patch on mac and windows. No difference in reviewboard behavior.
confirmed that I can apply the patch generated on the mac on a clean checkout on my windows machine.
google chrome web browser.

On windows used svn command line to generate patch:
svn, version 1.8.10 (r1615264)
compiled Aug 11 2014, 14:00:48 on x86/x86_64-microsoft-windows6.1.7601

Copyright (C) 2014 The Apache Software Foundation.

On mac, used eclipse plugin to generate patch: svn v.1.8.10 r10446 (using Eclipse)

The SVN version on the machine where reviewboard is running is:
svn, version 1.8.13 (r1667537)
compiled Aug 25 2015, 01:06:14 on x86_64-redhat-linux-gnu

Copyright (C) 2014 The Apache Software Foundation.

The diff version where reviewboard is running is:
diff (GNU diffutils) 3.3
Copyright (C) 2013 Free Software Foundation, Inc.

Please provide any additional information below.

Here is the directory listing:
-rw-r--r-- 1 apache apache 5070 Sep 18 14:01 QueryEngineGuiceBundle.java.diff
-rw------- 1 apache apache 4735 Sep 18 14:01 tmprqcjK0
-rw------- 1 apache apache 0 Sep 18 14:01 tmprqcjK0-new
-rw-r--r-- 1 apache apache 4825 Sep 18 14:01 tmprqcjK0-new.rej

The patch being uploaded contains several modified files, 1 properties files that is moved and 2 java files that are being moved. The moved files appear as a delete and then create in the svn diff. It is only the 2 java files that are being deleted that has the problem.

The java files are configured with "svn:eol-style=native;", but the working property file is not. The property file has "\ No newline at end of file" at the end of the diff in the patch, but the java files do not.

Let me know if there is a way of uploading private attachments and I will send you the contents of the /tmp/reviewboard.3wU_dl folder.

#1 david

You can send it to support@beanbaginc.com. Please reference this bug in that email.

#2 msunde

Any update? The files were sent some time ago. Thanks.

#3 david

We did get the files, but we've been pretty busy with other things. We will get to this eventually, I promise.