-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Erik Andersson <[EMAIL PROTECTED]> writes:
> OK, thanks a lot for your reply, but wouldn't this create the branch > from the "magic" import branch? If you mean that newbranch will have a magic version number of something like 1.1.1.1.0.2 and commits to it will look like 1.1.1.1.2.1, then yes. > Is that really ok? Sure, I do it all the time. > Is there no danger in creating branches from the revisions in a magic > branch? The vendor branch is not a magic branch (unless you did something very odd when you did the import with the -b option?), it is branch 1.1.1 and you would be maging a 'magic branch' from the latest VENDOR-VERSION tag which is not itself a branch. -- Mark > Best Regards / Erik > > -----Original Message----- > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Mark D. > Baushke > Sent: den 29 oktober 2004 18:15 > To: Erik Andersson > Cc: [EMAIL PROTECTED] > Subject: Re: Import and merge into branch > > Erik Andersson <[EMAIL PROTECTED]> writes: > > > I messed up and need to to a fresh import and then make a branch > > contain all from that import. How do I do? I only want that code in > > the branch and not into main.. > > > > Can I use the original branch and somehow merge this into the branch? > > > > Please help me out!! > > Assuming you did > > cvs import module VENDOR VENDOR-VERSION > > then something like this: > > cvs rtag -b -r VENDOR-VERSION newbranch module > cvs checkout -r newbranch module > > should get what you want. > > -- Mark -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.3 (FreeBSD) iD8DBQFBhQkF3x41pRYZE/gRAu/sAKDMgISDuYEyiS2LPO91cSXTJOYz2QCfd8hf C4y19fASes/ETRtLxqVllq8= =jDtA -----END PGP SIGNATURE----- _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs