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

Re: Looking for suggestions on repository design

From: Mark Phippard <MarkP_at_softlanding.com>
Date: 2005-04-30 17:47:20 CEST

> I am looking for some ideas here. We have an ERP product at work that we
get the source for. We
> also make some modifications to the source to add some of our own
business processes in to the
> application. So my first question would be how would you recommend laying
out the stucture for
>something like that? I was thinking about the trunk being the unmodified
source, then the modifed
>source being a branch. What are your thoughts?

Mike, glad to see you made it over here :)

The easiest thing to do, IMO, is to treat this like you would if this was a
variant of your own app. Use branches.

Create a trunk for the vendor code. Then copy the trunk to create a branch
for your modifications. When you get new code from the vendor, just copy
it into a checked out WC of trunk and commit. Then merge that commit into
a WC of your branch.

The hardest part is just taking the drop from the vendor and getting it
committed. In your case it is a bit easier than normal since I believe
Lawson is just sending you their changes. So you do not need to figure out
what has changed. Also, given that it is RPG and they know that people
modify it, they probably do not do any deletes or renames of existing
source. If they do, you just need to replay those actions in your WC for
their code.

I do something like this to manage our port of Subversion to OS/400. In my
case it is of course much easier since the development is all really
happening in the same repository. Your only challenge is really in
simulating the actions of your vendor in their code line. It should be
pretty easy, though, for the reasons stated.

Good luck.


Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Apr 30 17:49:19 2005

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.