[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Advice sought on how to diff and commit multiple files

From: Ryan Schmidt <subversion-2008c_at_ryandesign.com>
Date: Thu, 31 Jul 2008 03:46:18 -0500

On Jul 31, 2008, at 03:12, David Aldrich wrote:

> We are developing an application based on a project developed by a
> third party. That 'base' project consists of drivers and
> infrastructure code. Both we and the third party develop using SVN
> but it is likely that we won't be allowed access to the third
> party's repository. Instead, they will send use releases of the
> entire base project as zip files. We will then have to identify the
> files that have changed and commit only those to our repository
> (which contains both the base project and the application).
> If the dates of unchanged files remain identical between releases I
> guess this would be a simple matter of copying the zip file to a
> local working copy here. The SVN client should then identify the
> files that have changed by time comparison.
> However, I am not sure that the dates of unchanged files will be
> identical. Therefore, I think it would be safer to diff the
> contents of each file to identify changes and then commit. I guess
> this would require a script (certainly it couldn't be done manually
> because of the large number of files). So I would like to ask for
> advice on how to go about this. Am I likely to be able to find an
> existing script that would do this for me or must I write it myself?
> I am working under Windows and am proficient in C++ but not Python
> or Perl.

Hi David.

You will want to use svn_load_dirs.pl to load their code into a
folder in the /vendor directory in your repository. You will then
want to make a copy of their code to another location in your
repository, which is where you will modify their code as needed. When
you load new versions of their code into /vendor, you can then merge
their changes into your version using svn merge. See the Book:


To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-31 10:46:54 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.