From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Jon Smirl" Subject: Re: parsecvs and unnamed branches Date: Fri, 16 Jun 2006 18:28:08 -0400 Message-ID: <9e4733910606161528n668a96afgefca16644f8038b6@mail.gmail.com> References: <9e4733910606161444i2f996096sbd1f9b3f3ff3a32d@mail.gmail.com> <1150496362.6983.34.camel@neko.keithp.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: git X-From: git-owner@vger.kernel.org Sat Jun 17 00:28:20 2006 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1FrMnV-00023f-Ve for gcvg-git@gmane.org; Sat, 17 Jun 2006 00:28:14 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751451AbWFPW2K (ORCPT ); Fri, 16 Jun 2006 18:28:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751513AbWFPW2K (ORCPT ); Fri, 16 Jun 2006 18:28:10 -0400 Received: from nz-out-0102.google.com ([64.233.162.197]:58513 "EHLO nz-out-0102.google.com") by vger.kernel.org with ESMTP id S1751451AbWFPW2I (ORCPT ); Fri, 16 Jun 2006 18:28:08 -0400 Received: by nz-out-0102.google.com with SMTP id s18so1251032nze for ; Fri, 16 Jun 2006 15:28:08 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=VBIMvlNCryeWPcgDPQcrw0lsbQJ+ay++QB4ir0W9y6LmLiHNqFLBFQIhrwJVeXEzyS8ajOEE7l4DI6ual2pEl9xPDr9Px7sauZaSomXmFvu2zyMu+XXw0edj9ARAdg8fMsVq0PctnEVPXy8ZDKcHch9L/+C+3Ko25UyMOeaj6HA= Received: by 10.36.227.78 with SMTP id z78mr4376120nzg; Fri, 16 Jun 2006 15:28:08 -0700 (PDT) Received: by 10.36.36.7 with HTTP; Fri, 16 Jun 2006 15:28:08 -0700 (PDT) To: "Keith Packard" In-Reply-To: <1150496362.6983.34.camel@neko.keithp.com> Content-Disposition: inline Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: On 6/16/06, Keith Packard wrote: > On Fri, 2006-06-16 at 17:44 -0400, Jon Smirl wrote: > > I'm getting thousands of messages about unnamed branches and even > > 'unnamed branch from master-UNNAMED-BRANCH'. > > > > How do you get unnamed branches into CVS, are these check-in errors or > > are people actually working on unnamed branches? Or is parsecvs not > > finding all of the branch info? > > branch names rely on a special 'branch tag' in the "symbols" section of > the CVS file, but actual branches are flagged directly in the revision > list. I don't know how it happens, but ,v files often end up with > branches in the revision tree which haven't an associated tag. Go > figure. > > For example, in the top level mozilla/Makefile.in,v file, you'll see a > branch from version 1.36 with an initial commit 1.36.2.1. Using the > wacky CVS branch revision numbering scheme, there should be an > associated tag for version 1.36.0.2 (yes, the last two digits are > flipped). But, none is present in the file. I was reading the CVS manual and it talks about magic branch number as being the ones with zero in them. Doesn't go into a lot of detail. Apparently they are autogenerated internally. http://ximbiot.com/cvs/wiki/index.php?title=CVS--Concurrent_Versions_System_v1.12.12.1:_Branching_and_merging#Magic_branch_numbers > > The reverse situation also occurs, with tags for branches that have no > revisions in the file. This case makes sense -- until you make a change > in a file along a branch, there will be no other record in the file of > where the branch came from. > > I'd love to figure out a better mechanism for merging these nameless > branches into the resulting repository, but I don't know how to > correlate unnamed branches in one file with unnamed branches in other > files. > > The current scheme of making up a fixed name and hoping that there > aren't multiple unmamed branches from the same root is probably fraught > with peril. > > -- > keith.packard@intel.com > > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.3 (GNU/Linux) > > iD8DBQBEky5qQp8BWwlsTdMRAvI1AJ4nXKyzeupTDarXI+yM0zvuHaCoTQCdEBYC > Kl7lEHIJgi5Tk24quc9FZyM= > =FA7H > -----END PGP SIGNATURE----- > > > -- Jon Smirl jonsmirl@gmail.com