You are viewing a plain text version of this content. The canonical link for it is here.

Posted to derby-commits@db.apache.org by Apache Wiki <wi...@apache.org> on 2006/02/24 00:22:32 UTC

[Db-derby Wiki] Update of "AddedOrDeletedFilesInDiff" by BryanPendleton

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Db-derby Wiki" for change notification.

The following page has been changed by BryanPendleton:
http://wiki.apache.org/db-derby/AddedOrDeletedFilesInDiff

New page:
The patch format as produced by "svn diff" is not perfect; in particular, it does not clearly describe changes which entirely delete existing files or which add brand-new files. For more background on the problem, read: http://svn.haxx.se/dev/archive-2004-09/0469.shtml

If the patch adds or deletes a file, this should have been mentioned explicitly by the developer when the patch was attached to the JIRA issue, and the output of "svn stat" should also have been attached to assist the committer and reviewers.

Here's how to apply a patch which includes adds and/or deletes:
 * apply the patch normally, using "patch -p0"
 * read the "svn stat" output from the JIRA issue, and take note of each file which is to be (A)dded or (D)eleted.
 * For each file, "svn revert" the file to undo the changes made by patch, then issue "svn add" or "svn delete" as appropriate.
 * Issue "svn stat" on your sandbox, and compare the results against the output attached to the JIRA issue.