[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Bad import with vendor tag set to a valid branch tag
From: |
Pierre Asselin |
Subject: |
Re: Bad import with vendor tag set to a valid branch tag |
Date: |
Tue, 7 Mar 2006 01:51:37 +0000 (UTC) |
User-agent: |
tin/1.6.2-20030910 ("Pabbay") (UNIX) (NetBSD/2.0.3 (i386)) |
Greg Kilfoyle <address@hidden> wrote:
> In two separate instances there was code imported into our cvs repo
> which had the vendor tag argument set to an existing branch tag. Clearly
> this was a mistake, but I'm wondering if there is any way to fix it.
Ouch.
> In one case the branch tag is no longer used, so it doesn't cause any
> problems. In the other case, the branch tag is in active use and any
> time a change is made to one of the imported files on the branch, it
> magically appears on the trunk.
I think you need to use 'cvs admin -b' to reset the default branch
to 1.1.1 or to the trunk, file by file.
To clean up the branch it self, you could use 'cvs admin -o' to remove
the incorrect imports.
Or you could restore your repository from backups :-(
--
pa at panix dot com