[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: Import and merge into branch
From: |
Erik Andersson |
Subject: |
RE: Import and merge into branch |
Date: |
Sun, 31 Oct 2004 16:42:27 +0100 |
OK, thanks a lot for your reply, but wouldn't this create the branch
from the "magic" import branch? Is that really ok? Is there no danger in
creating branches from the revisions in a magic branch?
Best Regards / Erik
-----Original Message-----
From: address@hidden [mailto:address@hidden On Behalf Of Mark D.
Baushke
Sent: den 29 oktober 2004 18:15
To: Erik Andersson
Cc: address@hidden
Subject: Re: Import and merge into branch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Erik Andersson <address@hidden> 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)
iD8DBQFBgmyh3x41pRYZE/gRAnpJAKCe/kOFLGyMGQlFiiKH7rpNNFlSawCdEO54
Y37ySHXbJrOLgcioz92Csqw=
=+vFW
-----END PGP SIGNATURE-----