We use the same branching strategy here, and have been for over 4 years......
But as for merging....one word of caution.....
Make sure the user performs a 'catchup-from-main' merge, prior to there merge
to main.
By this, I mean they merge from /main/LATEST onto their branch. This is
necessary, so that they get any changes that someone else has made to the same
files that they merged to main. Once this is done (any any problems sorted),
they can saftely merge their stuff to main.
As you can see below, the file modified on brnach ar1235 was merged to main.
Then the person working on branch ar1234, performed a catchup.
(Embedded image moved to file: pic19879.pcx)
As for performing the merge....we use the NT merge Manager GUI tool....its
proved to be very stable, and hasn't caused us any problems...and its ALOT
easier & quicker than performing the merge yourself on every file (& directory).
HTH
Andy
"Reichert, Anne @ Horsham" <ReichertA on 03/02/2000 16:10:13
To: John Lawlor <John@wbtsystems.com>,
cciug@Rational.Com
cc: (bcc: Andrew Mcdonagh/MAIN/MC1)
Subject: RE: [cciug] Branch for NT development
John,
Your config spec will branch your elements 1 by 1 as they are checked out.
There is no reason to create a branch on every element in the project, only
the ones that are being changed. I use the same config spec and I find it
works very well for me. ClearCase Details will allow you to see which
objects have had branches created. I produce that list before doing my
merges. I do do the merges 1 by 1. There may be an easier/better way but I
tend to be a little anal.
anne
> -----Original Message-----
> From: John Lawlor [SMTP:John@wbtsystems.com
> Sent: Thursday, February 03, 2000 10:57 AM
> To: cciug@Rational.Com
> Subject: [cciug] Branch for NT development
>
>
> Hi All,
>
> We are in the early stages of ClearCase and don't really use branches
> until
> now.
>
> One of the development groups wants to create a branch for doing NT
> development work only and then merge it back in a few weeks (another
> story).
> The development group each use their own views.
>
> What is the best way to manage this branch?. All I have come up with so
> far
> is,
> 1. Declare a branch type 'nt_development'
> 2. Do a Cleartool mkbranch nt_development.
>
> These raise a few questions,
> Can I branch the whole project or can I only do one file at a time?
> If I get the developers to setup the views with these rules:
> element * CHECKEDOUT
> element * /main/nt_development/LATEST
> element * /MAIN/1 -mkbranch nt_development
> that will branch each file version onto this branch, but will I have to
> merge the files back in 1 by 1?
>
> What is the best/smoothest way to get through this?
>
> All ideas are very very welcome.
>
> Regards,
>
> John.
>
> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
>
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
This archive was generated by hypermail 2b29 : Sun May 06 2001 - 00:22:58 EDT