On 9/21/06, Jacob Atzen <jacob@jacobatzen.dk> wrote:
>
> On Thu, Sep 21, 2006 at 08:46:30AM -0400, Jonathan Wallace wrote:
> > There is also a program B that shares a subset of the files in A
> > including the main executable. For the subset of files and folders
> > shared between A and B, I'd like to insure that there is only one copy
> > of those files in the repository.
> >
> > My first thought was to make B a branch of A but then if someone
> > accidentally commits the main executable in a checked out copy of B,
> then I
> > now have two copies. Obviously, one can merge this B executable back
> into
> > the main trunk but this doesn't solve the underlying problem. I
> appreciate
> > any and all suggestions.
>
> Have you considered externals for the shared parts?
No, I hadn't even though I've used them once in the past for incorporating
3rd party code into another project. I'm still new to subversion and I
appreciate you making that point. After rereading the external section of
the book, does svn 1.4 support external definitions for files now? I didn't
see anything about it in the release notes or changes file. If so, that
would seem to resolve my issue.
It might be easier to give better advice if you supply more details
> about the directory layout of A and B.
Here's an example:
directory_one/
main.mdb
version.txt
reports/
config/
main.ico
directory_two/
main.mdb
version.txt
reports/
config/
main.ico
All files in directory_one and directory_two are exactly the same. Files
within their subdirectories, reports/ and config/, are different.
Physically, directory_one and directory_two are equivalent applications with
just different config files and different report files. Logically, they are
two separate applications.
My eventual goal is to move the bifurcation from the config/ and report/
directories and into the application to simplify deployment of the whole
application and maintenance of the reports. The reports' formats are the
same between directory_one/report and directory_two/report. The only
difference is that reports in directory_one connect to one data source and
reports in directory_two connect to another one.
--
Jonathan Wallace
Received on Thu Sep 21 19:38:47 2006