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:10:53 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

------------------------------------------------------------------------------
  
  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.
+ 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. Do not  automatically
take for granted the properties in the contributor's patch file, he/she may have got it wrong;
use your own judgement.
  
  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.

Mime
View raw message