Re: tag and branch names collision

[Jean-Pierre Sevigny]

Jim.Hyslop wrote:

Jean-Pierre Sevigny wrote:
  

Thanks for the answer. I'm having a case i don't understand.

I have a file that was added to a branch. So, the HEAD view 
shows it in the Attic. Now, on the HEAD, a tag was added (at 
the same level, i.e. revision 1.1). I'm wondering how this 
happened? Those files are actually the ones creating 
problems, as i have no way of checking them out (they were 
later removed from the branch also). The problem is that the 
tag on revision 1.1 is also a branch somewhere else.
    

Sorry, my mind is a bit foggy this morning, and I didn't quite follow that.
Could you please post the output of 'cvs log' or 'cvs stat -v' for the
specific files and tags that are the problem?

  

Hi,

This is the output:

note: as far as i know, the only way i could get a *checked out* copy of that file was to do a cvs update -r 1.1.2.1.

cvs stat -v licence.php
===================================================================
File: licence.php       Status: Up-to-date

   Working revision:    1.1.2.1
   Repository revision: 1.1.2.1 /usr/local/Warehouse/RevisionControl/WCS/Oem/unified/cards/xhtml/nextel/Attic/licence.php,v
   Sticky Tag:          1.1.2.1
   Sticky Date:         (none)
   Sticky Options:      (none)

   Existing Tags:
        uwap_3_1-RELEASE                (revision: 1.1)
        uwap_3_0-RELEASE                (revision: 1.1)
        wap_2_2-RELEASE                 (branch: 1.1.2)

======================

cvs log licence.php

RCS file: /usr/local/Warehouse/RevisionControl/WCS/Oem/unified/cards/xhtml/nextel/Attic/licence.php,v
Working file: licence.php
head: 1.1
branch:
locks: strict
access list:
symbolic names:
        uwap_3_1-RELEASE: 1.1
        uwap_3_0-RELEASE: 1.1
        wap_2_2-RELEASE: 1.1.0.2
keyword substitution: kv
total revisions: 3;     selected revisions: 3
description:
----------------------------
revision 1.1
date: 2004/05/20 21:44:04;  author: gary;  state: dead;
branches:  1.1.2;
file licence.php was initially added on branch wap_2_2-RELEASE.
----------------------------
revision 1.1.2.2
date: 2004/05/25 22:19:19;  author: yong;  state: dead;  lines: +0 -0
nextel directory ->nxt... fixes licence/terms
----------------------------
revision 1.1.2.1
date: 2004/05/20 21:44:04;  author: gary;  state: Exp;  lines: +13 -0
nextel licence
=============================================================================


Jean-Pierre