CODEWITHSUNDEEP
svndiffpatch
Ryan R.
Ryan R.

Reputation: 2588

svn client 1.4.4 any hope in applying a patch?

I am stuck using an old svn client 1.4.4. I was able to create a patch using the standard approach of piping to a file:

svn diff > ~/bug_fix.diff

Is there any hope in applying this patch? I see that there is no "svn patch" sub-command in this version.

Would it be possible to use a newer client to apply the patch without breaking compatibility with 1.4.4?

Upvotes: 0

Views: 65

Answers (3)

Ryan R.
Ryan R.

Reputation: 2588

cygwin ended up being the solution here for me:

diff -N -x .svn -rup ./original_trunk ./new_trunk > patch.diff

cd to ./original_trunk

patch -p0 < ../patch.diff

original trunk should now have the changes from new trunk.

Hardest part about this is getting the diff and patch utilities installed in cygwin. I installed the patch utility using apt-cyg and diff I found in the cygwin installer.

Upvotes: 0

emcconville
emcconville

Reputation: 24419

Apply subversion diff file by using the patch utility (or patch.exe on windows.)

patch -p0 < ~/bug_fix.diff

or

patch.exe -p0 < ~/bug_fix.diff

Upvotes: 1

Lazy Badger
Lazy Badger

Reputation: 97282

Is there any hope in applying this patch?

It can be compatible with ordinary OS patch command

Upvotes: 1

Related Questions