Databases
StackOverflow2013
Postsdbo
POHow can I modify the file path in a set of Git patches?
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POHow can I modify the file path in a set of Git patches?
    primarykey
    data
    text
    <p>I'm working on a Git repo that's been pulled from an SVN repo using <code>git svn</code>. Many moons ago, the SVN repo was created from a source tarball of the original (upstream) project. The original project had a file structure like the following:</p> <pre><code>/ COPYING README src/ ...many source files... </code></pre> <p>However, when the SVN repo was created, the README files, etc., were stripped out, and the app was created with <code>src/</code> as the root, so the repo now just looks like:</p> <pre><code>/ ...many source files </code></pre> <p>I recently converted this SVN repo into a Git repo. The original project is also in a Git repo, and I'd like to start tracking upstream changes so I can easily see what custom changes have been made (and submit patches back to the original project, if applicable). I've found the commit in the upstream repo that our SVN repo was created from, so now I'd like to apply our changes to that commit (in a branch). I can easily create a set of patches using <code>git format-patch</code> and apply them to the cloned upstream repo...except that the file structures are different, so the patches don't point to the correct files anymore. Is there a way to apply the patches from <code>git format-patch</code> to the <code>src/</code> directory in the cloned repo? (Note that the Git patches also have the necessary info like the original author name, email, and date, which I'd also like to apply and not have to do by hand, i.e., by messing around with <code>GIT_AUTHOR_EMAIL</code>, etc.)</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. This table or related slice is empty.
    1. USmipadi
    plurals
    1. PL
      singulars
      1. LTLinked
    1. PL
      singulars
      1. LTLinked
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    2. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POHow can I modify the file path in a set of Git patches?
      1. USBenjamin Bannier
      1. VTFavorite
    2. VO
      singulars
      1. POHow can I modify the file path in a set of Git patches?
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POHow can I modify the file path in a set of Git patches?
      1. This table or related slice is empty.
      1. VTUpMod
    1. COSimilar question: http://stackoverflow.com/questions/931882/how-to-apply-a-git-patch-from-one-repository-to-another
      singulars
      1. POHow can I modify the file path in a set of Git patches?
      1. USkoppor
 

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