Databases
StackOverflow2013
Postsdbo
POCreating an SVN patch including new directories
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POCreating an SVN patch including new directories
    primarykey
    data
    text
    <p>First of all excuse the long text, but I am trying to be as detailed as I can.</p> <p>I am developing for an open-source project (DSpace). I don't have commit privileges to their SVN repo, so I checked out the source and have been using git to manage my versioning.</p> <p>During my development, i've added several directories and binary files to my project.</p> <p>The time has come to make an SVN patch file so I can give something back to the community! Netbeans does this for me through the Team-> Create patch option. So far so good...</p> <p>However, when I check out the source again on another machine and use the patch command:</p> <pre class="lang-sh prettyprint-override"><code># get current dir DIR="$( cd "$( dirname "$0" )" &amp;&amp; pwd )" #check out dspace release svn co http://scm.dspace.org/svn/repo/dspace/tags/dspace-1.7.2/ -q $DIR/dspace-1.7.2/ #apply patch cd $DIR/dspace-1.7.2 echo "Now running at "&amp;&amp; pwd patch --dry-run -N -p0 &lt; $DIR/patches/patch.diff cd $DIR </code></pre> <p><strong>Running Script</strong></p> <p>When i run this script, all goes well until the patch attempts to modify a file inside one of my new directories. It says the following:</p> <pre class="lang-sh prettyprint-override"><code>can't find file to patch at input line 9214 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Index: dspace-jspui/dspace-jspui-webapp/src/main/webapp/static/js/jQueryUI/jquery-ui.js |--- dspace-jspui/dspace-jspui-webapp/src/main/webapp/static/js/jQueryUI/jquery-ui.js Base (BASE) |+++ dspace-jspui/dspace-jspui-webapp/src/main/webapp/static/js/jQueryUI/jquery-ui.js Locally Modified (Based On LOCAL) -------------------------- File to patch: </code></pre> <p><strong>Before it stops, it is able to patch a bunch of files which were already in the original dspace release,</strong> so I think it is not related to the -pXXX parameter of the patch command (nevertheless i have tried up to -p10) ... I think this only happens when I attempt to patch a file inside one of my created directories. <strong>My guess is that the patch command does not create new directories, so it cannot find the correct paths.</strong> </p> <p>This is driving me nuts, please does anyone have any idea how to solve my problem?</p> <p>Thanks in advance!</p> <p>EDIT: </p> <p>I've added the --verbose option to the patch command. Here's the result:</p> <pre class="lang-sh prettyprint-override"><code>-------------------------- Patching file dspace-jspui/dspace-jspui-webapp/src/main/webapp/static/js/autocompleter/styles.css using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... can't find file to patch at input line 9214 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Index: dspace-jspui/dspace-jspui-webapp/src/main/webapp/static/js/jQueryUI/jquery-ui.js |--- dspace-jspui/dspace-jspui-webapp/src/main/webapp/static/js/jQueryUI/jquery-ui.js Base (BASE) |+++ dspace-jspui/dspace-jspui-webapp/src/main/webapp/static/js/jQueryUI/jquery-ui.js Locally Modified (Based On LOCAL) -------------------------- File to patch: </code></pre> <p>After I quit the patch process, if i make </p> <pre class="lang-sh prettyprint-override"><code>cd dspace-1.7.2/dspace-jspui/dspace-jspui-webapp/src/main/webapp/static/js/jQueryUI </code></pre> <p>I get:</p> <pre class="lang-sh prettyprint-override"><code>-bash: cd: dspace-1.7.2/dspace-jspui/dspace-jspui-webapp/src/main/webapp/static/js/jQueryUI: No such file or directory </code></pre> <p>This is one of the folders I added during the development, which proves that patch is not creating these new folders.</p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PTQuestion
    1. USJoão Rocha da Silva
    1. USJoão Rocha da Silva
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POCreating an SVN patch including new directories
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POCreating an SVN patch including new directories
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POCreating an SVN patch including new directories
      1. This table or related slice is empty.
      1. VTUpMod
    1. COCan you show some or all of patch.diff? I don't know how NetBeans generates the patch, but if you add a file or directory in the filesystem and don't tell subversion it should be added, it won't show up in a patch generated by the CLI client.
      singulars
      1. POCreating an SVN patch including new directories
      1. USSteveMc
    2. COI've tried adding all the files in my modified directory through svn add * -- force and then i did the svn diff > patch.diff command. Unfortunately i cannot post the diff file here, since it is an academic work and can only be published after review ... :(
      singulars
      1. POCreating an SVN patch including new directories
      1. USJoão Rocha da Silva
    3. COI think you may need to create the directory and files manually in your checkout - thinking about this further, I don't think subversion supports creating new directories (nor files, I don't think) in patches - svn diff only lists textual differences.
      singulars
      1. POCreating an SVN patch including new directories
      1. USSteveMc
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload