Describe upstreaming changes

[ben-edna]

One of the design goals of DFetch is to allow local changes, but promote upstreaming changes.
However, it is currently unclear how to upstream a change.

Add documentation, for instance that you can use:

Git

Creating the patch

cd <path-to-parent-of-project>
git diff --relative --no-color<SHA-of-unchanged-project> <SHA-of-last-fix> > my_fixes.patch

Note that powershell will pipe into UTF-16 LE encoded file, make sure it is UTF-8 with:

git diff --no-color --relative <SHA-of-unchanged-project> <SHA-of-last-fix>  | out-file -encoding ASCII my_fixes.patch

Applying the patch

To apply it (note that patch file will have relative paths)

git apply  --directory <path-of-file-in-repo> my_fixes.patch 

SVN

Creating the patch

cd <path-to-parent-of-project>
svn diff -r <rev-of-unchanged-project>:<rev-of-last-fix> > my_fixes.patch

Applying the patch

To be investigated

After upstreaming

After your changes were accepted (or you have a branch in the upstream project you like).
You can update the project or the manifest:

dfetch check

[ben-edna]

DFetch supports upstreaming changes through dfetch diff both for svn and git repositories. No need to further document this.