How do I make / apply a diff patch to this situation?

Question

I have a project like WORDPRESS. and I use SVN.

I have the following copies:

a. WP2.6 from wordpress.org

V. WP2.6, I am changing some core files (add / change / change the code of some files)

C. WP2.7 from wordpress.org

I would like to upgrade version A to C and save changes to version B.

Some of my changes might be:

Version A Code:

123 123

Version B code:

123 x 123

Version C Code:

123 123 123

expected final version:

123 x 123 123

How can I make / apply a patch to this project? any faster / easier way if I have over 100 different files

Maybe I'm wrong. please suggest doing it right. thanks.

Answer 1

( ): - , , .

• (A) /trunk,
• "vendor" WP2.6
• (B) . svn rm svn mv
• (A) -WP2.6
• (C) ( , svn mv svn rm, ) commit
• WP2.6 ( )
• , , .

---

, , : :

123 x 123 123
123 123 x 123