Getting phpMyAdmin into project and not causing errors in subversion

Question

I have a project that includes a copy of phpMyAdmin.

I do development locally and use subversion for version control.

When a new release of phpMyAdmin comes out I have to take all of the files from the new phpMyAdmin release and move them into the exiting files in my project. If I copy the entire directory I get errors the next time I commit to the server.

Is there an easier way of dealing with this? Is there something I can do to quickly get the updates from phpMyAdmin into my project without causing problems in my local working copy?

Answer 1

Also I'd recommend downloading a copy of Version Control with Subversion, which has a section on vendor branches. You use these to import third-party source code into a Subversion repository/project.