db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache Wiki <wikidi...@apache.org>
Subject [Db-derby Wiki] Update of "AddedOrDeletedFilesInDiff" by BryanPendleton
Date Sat, 04 Mar 2006 00:08:04 GMT
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

------------------------------------------------------------------------------
  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"
+  * apply the patch normally, using {{{patch -p0}}}
+  * run {{{svn status}}}.
   * 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.
-  * for each text file, ensure the svn:eol-style native property has been set using svn propset.
-  * Issue "svn stat" on your sandbox, and compare the results against the output attached
to the JIRA issue.
  
+ Newly added files will show up with ?, indicating that Subversion does not know anything
about them. You will have to add these yourself using svn add.
+ 
+ You will have to set svn properties for added files. In particular for all text files. Run
svn propset svn:eol-style       native FILE(S). If you have your subversion configuration
setting this should be done automatically. Add this list to your {{{~/.subversion/config}}}
file, as described in http://www.apache.org/dev/version-control.html.
+ 
+ Now compare your sandbox to the contributor's: run {{{svn status | diff - CONTRIBUTOR'S_SVN_STATUS_FILE}}}.
This should be clean, except that the ordering may be different. You can overcome this by
sorting both your own svn status output and the contributor's file with sort before comparing:
{{{svn status | sort > MY_SVN_STATUS_FILE; cat CONTRIBUTOR'S_SVN_STATUS_FILE | sort | diff
- MY_SVN_STATUS_FILE}}}.
+  * If the svn status output was made on Windows vs. Unix, you may need to adjust formatting
such as spacing and forward             versus backward slashes.
+  * If the diff contains new, empty files, patch will not create them for you; you will have
to create them yourself            using touch FILENAME.
+    * After creating such new, empty files, you will have to add them, too, with svn add.
+ 
+ For a file which was supposed to be deleted, {{{svn revert}}} the file to undo the changes
made by patch, then issue {{{svn delete}}} to mark the file for deletion.
+ 
+ When you think you are done, issue "svn stat" on your sandbox, and compare the results against
the output attached to the JIRA issue.
+ 

Mime
View raw message