comp.lang.idl-pvwave archive: archive

Home » Public Forums » archive » Re: SVN Question

Show: Today's Messages :: Show Polls :: Message Navigator
E-mail to friend

Re: SVN Question [message #57520 is a reply to message #57517]

Mon, 10 December 2007 10:48

Paul Van Delst[1]
Messages: 1157
Registered: April 2002

Senior Member

David Fanning wrote:
> Paul van Delst writes:
>
>> This statement confuses me. You don't have replicated files in your repository, surely?
>> E.g. there is only one version of fsc_color.pro that is used by code in both the "coyote"
>> and "catalyst" directories.
>
> Some of you may have experienced the difficulties inherent
> in trying to maintain backward compatible code. Of course,
> I always stay on the cutting edge of things, but occasionally
> customers have older (MUCH older!) versions of IDL. Catalyst,
> in particular, seems to run into this problem, and I've had
> to maintain "old" versions that don't support some of the
> newest features of the language.

Wouldn't older version be tagged as "released" or in separate release branches? You don't
want old stuff polluting your trunk, surely.

The way I organise my repository (not my idea, adapted it from Mike Mason's "Pragmatic
Version Control using Subversion") is via the following conventions:

e.g.:

svnrepos
|-- trunk
|-- branches
| |-- RB-1.0
| |-- RB-1.0.1
| |-- RB-1.0.2
| |-- EXP-exp1_name
| |-- EXP-exp2_name
| `-- RB-2.0
`-- tags
|-- REL-1.0
`-- REL-1.0.1

with:

trunk: The main line of stable, planned development
branches:
- Release Branches are label "RB-rel#"
- EXPerimental development branches are labeled "EXP-desc"
tags:
- Actual RELeases are label "REL-rel#" (matches the RB tag)
- Also tag snapshots of trunk or other branches (add the date and rev# to tag).
- NO DEVELOPMENT (otherwise it would be a branch).

So, if I need to keep an older release around (that some client is still using, dammit
:o), it's in a branch. Appropriate changes can still be merged to/from the trunk from/to
any of the branches as needed. Bleeding edge stuff goes in a "EXP" branch.

In subversion, branches and tags are cheap - so use 'em liberally and wear them out.

cheers,

paulv

p.s. There are some additional naming conventions for bug fixes if you have a tracking
system too.

Report message to a moderator

[Message index]

		Re: SVN Question By: Paul Van Delst[1] on Mon, 10 December 2007 13:23
		Re: SVN Question By: Vince Hradil on Mon, 10 December 2007 12:50
		Re: SVN Question By: David Fanning on Mon, 10 December 2007 12:41
		Re: SVN Question By: Vince Hradil on Mon, 10 December 2007 12:37
		Re: SVN Question By: David Fanning on Mon, 10 December 2007 12:30
		Re: SVN Question By: David Fanning on Mon, 10 December 2007 12:01
		Re: SVN Question By: Vince Hradil on Mon, 10 December 2007 11:50
		Re: SVN Question By: David Fanning on Mon, 10 December 2007 11:41
		Re: SVN Question By: Michael Galloy on Mon, 10 December 2007 11:30
		Re: SVN Question By: David Fanning on Mon, 10 December 2007 10:53
		Re: SVN Question By: Paul Van Delst[1] on Mon, 10 December 2007 10:48
		Re: SVN Question By: David Fanning on Mon, 10 December 2007 09:28
		Re: SVN Question By: David Fanning on Mon, 10 December 2007 09:23
		Re: SVN Question By: Paul Van Delst[1] on Mon, 10 December 2007 09:08
		Re: SVN Question By: Vince Hradil on Mon, 10 December 2007 08:43

Previous Topic:	Another Nice Thing
Next Topic:	Re: Freezing your printout...

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

] [

]

Current Time: Sat Nov 29 23:06:14 PST 2025

Total time taken to generate the page: 1.03854 seconds