RE: [cciug] Merge back to main where only /main/0 exist

From: Matt Walsh (mwalsh@waverider.com)
Date: Wed Jul 18 2001 - 12:58:49 EDT


Okay. First, I disagree with Neville's statement that /main/LATEST won't
find /main/0. If /main/0 is the LATEST, that's what it will find.

I assume the branch you're trying to merge from is nms_1.00_branch. Are you
100% sure that /main/0 is the latest version in /nms_unix/nms_image/...?

What does your findmerge command look like? My first guess would be that the
directories containing the new files aren't yet merged and you're trying to
merge the files directly. Whenever you create a new element, a /main/0
version is created, then branched and checked out on the branch. From your
default config spec, you won't see that /main/0 version until the directory
has been merged.

Post your findmerge command and maybe the vtree for a file that is giving
you problems.

Matt

-----Original Message-----
From: Pamela Ren [mailto:pamela_ren2001@yahoo.com
Sent: Wednesday, July 18, 2001 10:37 AM
To: mwalsh@waverider.com; Walshe, Neville; cciug@rational.com
Cc: cciug@rational.com
Subject: RE: [cciug] Merge back to main where only /main/0 exist

Matt,

>From view has the following Config. Spec.

********************************
element * CHECKEDOUT
element /nms_unix/nms-image/...
/main/nms_1.00_branch/LATEST
element /nms_unix/nms-image/... NMS_1.00_BASELINE
-mkbranch nms_1.00_branch
element /nms_unix/nms-image/... /main/0 -mkbranch
nms_1.00_branch
element * /main/LATEST
****************************************

To view is the default one:

*****************************************
element * CHECKEDOUT
element * /main/LATEST
*****************************************

Thanks,

--- Matt Walsh <mwalsh@waverider.com> wrote:
> Post a copy of your config spec.
>
> Matt
>
> -----Original Message-----
> From: owner-cciug@rational.com
> [mailto:owner-cciug@rational.comOn
> Behalf Of Pamela Ren
> Sent: Tuesday, July 17, 2001 5:46 PM
> To: Walshe, Neville; cciug@rational.com
> Subject: RE: [cciug] Merge back to main where only
> /main/0 exist
>
>
>
> Walshe,
>
>
> I tried to have a /main/0 rule under /main/LATEST. I
> still cannot see those files that are in the leave
> branch and have a version 0 under main. What might
> be
> wrong?
>
> Thanks,
>
> --- "Walshe, Neville"
> <Neville.Walshe@PanasonicCalgary.com> wrote:
> > Pamela
> >
> > I'm guessing the view you used to do the merge
> > doesn't have a main/0 rule
> > (normally the last rule) to catch this.
> > Main/0, as the only version on the branch is only
> a
> > placeholder. Unless your
> > config spec shows this rule, main/Latest won't
> catch
> > it. Merge manager will
> > not see these files.
> >
> > Hope that helps
> >
> > Neville
> >
> >
> > -----Original Message-----
> > From: Pamela Ren [mailto:pamela_ren2001@yahoo.com
> > Sent: Tuesday, July 17, 2001 3:49 PM
> > To: cciug@rational.com
> > Subject: [cciug] Merge back to main where only
> > /main/0 exist
> >
> >
> >
> > All,
> >
> >
> > I was trying to merge a large codebase from a
> leave
> > branch back into the main branch. There are some
> > files
> > that only have a /main/0 version. This is where I
> > encountered problems. Findmerge complains that the
> > file doesn't exist.
> >
> > I tried to do a "add to source" (NT) of one
> > particular
> > file under the /main/LATEST rules. It allows me to
> > do
> > it!! Now I have two elements under the same
> > directory
> > with the same name.
> >
> > Is this a Bug? It shouldn't allow me to add an
> > element
> > with a name that is already exist in the same
> > directory.
> >
> >
> > Any help would be much appreciated!!
> >
> >
> >
> > =====
> > Pamela Ren
> > Release Engineer/Configuration Manager
> > LuxN Inc.
> > 570 Maude Court
> > Sunnyvale, Ca 94086
> >
> > __________________________________________________
> > Do You Yahoo!?
> > Get personalized email addresses from Yahoo! Mail
> > http://personal.mail.yahoo.com/
> > - - - - - - - - - - - - - - - - - - - - - - - - -
> -
> > - - - - - -
> >
> >
> >
> >
> >
> >
> >
> >
>
http://clearcase.rational.com/cciug/mailing_list.html
> > --Appended by Matsushita Mobile Communications
> > Development Corporation of
> > U.S.A.-----This e-mail and any attachments may
> > contain information that is
> > confidential, proprietary, privileged or otherwise
> > protected by law. The
> > information is solely intended for the named
> > addressee (or a person
> > responsible for delivering it to the addressee).
> If
> > you are not the intended
> > recipient of this message, you are not authorized
> to
> > read, print, retain,
> > copy or disseminate this message or any part of
> it.
> > If you have received
> > this e-mail in error, please notify the sender
> > immediately by return e-mail
> > and delete it from your computer.
>
>
> =====
> Pamela Ren
> Release Engineer/Configuration Manager
> LuxN Inc.
> 570 Maude Court
> Sunnyvale, Ca 94086
>
> __________________________________________________
> Do You Yahoo!?
> Get personalized email addresses from Yahoo! Mail
> http://personal.mail.yahoo.com/
> - - - - - - - - - - - - - - - - - - - - - - - - - -
> - - - - - -
>
>
>
>
>
>
>
http://clearcase.rational.com/cciug/mailing_list.html

=====
Pamela Ren
Release Engineer/Configuration Manager
LuxN Inc.
570 Maude Court
Sunnyvale, Ca 94086

__________________________________________________
Do You Yahoo!?
Get personalized email addresses from Yahoo! Mail
http://personal.mail.yahoo.com/

 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -



This archive was generated by hypermail 2b29 : Tue Jul 31 2001 - 22:03:57 EDT