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

RE: [TSVN] Branching question

From: Andreas Brag <abrag_at_hstnet.de>
Date: 2004-08-18 08:26:14 CEST

HI Amir,

How about changing the order of your sourcecode ?
I'd try a setup like this:
Every user uses his own branch in the repos. In this branch, the user
specific file is hold in a seperate directory (all these files are
copies of a common ancestor with the common parts in it).
The users check oput this directory and are adding the rest of the
project (the trunk) as external projects.
With this screnario, each developer has his own file inside svn and the
common trunk is untouched.

So this would be the layout of the repos

/ -- users
  | |-- foo
  | | |--footypes.h
  | | |--project (property externals: repos/project/trunk)
  | |-- bar
  | | |--bartypes.h
  | | |--project (property externals: repos/project/trunk)
  |- project
  | |--trunk
  | |--tags
...

Hope this helps

Andreas

Message written 17.08.2004 :

>Incidentally, I don't mind putting the file in a directory of its own,
if
>that makes things easier. Thus, the working copy would point to the
trunk
>with a single directory within it pointing to a branch... Is that
possible?
>
> Amir Kolsky
>XP& Software
>
>
>]-----Original Message-----
>]From: Amir Kolsky [mailto:amir@xpandsoft.com]
>]Sent: Tuesday, August 17, 2004 6:22 PM
>]To: dev@tortoisesvn.tigris.org
>]Subject: RE: [TSVN] Branching question
>]
>]That won't solve the problem as you still want the file in
>]svn. Parts of it change and apply to all, parts are particular
>]to the story the developer is working on.
>]
>] Amir Kolsky
>]XP& Software
>]
>]
>]]-----Original Message-----
>]]From: anahata@microrobotics.co.uk
[mailto:anahata@microrobotics.co.uk]
>]]Sent: Tuesday, August 17, 2004 4:59 PM
>]]To: dev@tortoisesvn.tigris.org
>]]Subject: Re: [TSVN] Branching question
>]]
>]]On Tue, Aug 17, 2004 at 05:48:30PM +0200, Amir Kolsky wrote:
>]]> In our project we have a specific file with configuration info.
>]]> When we develop we want the developers to work on the trunk
>]- so ]> changes will propagate quickly to everyone.
>]]> However, that one file needs to be differenet for all. Is
>]]there a way ]> to have a branch for the one file?
>]]>
>]]
>]]Isn't the answer to have that file not under version control?
>]](delete &commit, then do a fresh checkout, then maybe also
>]set ]that file's name as an "ignore" pattern to dicourage it
>]from ]getting added
>]]back)
>]]
>]]
>]]--
>]]Anahata
>]]anahata_at_microrobotics.co.uk http://www.microrobotics.co.uk
>]]Micro Robotics Limited, 135 Ditton Walk, Cambridge CB5 8QB
>]]+44(0)1223 713326
>]]
>]]---------------------------------------------------------------------

>]]To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
>]]For additional commands, e-mail: dev-help@tortoisesvn.tigris.org ]
>]
>]
>]---------------------------------------------------------------------
>]To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
>]For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
>]
>
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
>For additional commands, e-mail: dev-help@tortoisesvn.tigris.org

-----------------------------------------------------------------------
Andreas Brag, Development

HST High Soft Tech GmbH
Stresemannstr. 46, D-27570 Bremerhaven
http://www.hstnet.de
mailto:abrag@hstnet.de
Tel +49 (471) 92 22-00, Fax +49 (471) 92 22-09
-----------------------------------------------------------------------

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Aug 18 09:31:54 2004

This is an archived mail posted to the TortoiseSVN Dev mailing list.

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