Hi,

the following sequence might help you to get your tree with local
changes across r5506 and r5507 without too much headache:

svn diff > backup.diff
patch -R -p0 -i backup.diff
svn up
patch -l -p0 -i backup.diff

Please make sure that your local changes don't reintroduce whitespace
(eg. new lines).

patch -l is a modifier where patch doesn't take whitespace changes into
consideration. This option requires gnu patch, but I doubt any coreboot
user but me cares about that.


Regards,
Patrick

-- 
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot

Reply via email to