Import and merge into branch

2004-10-29 Thread Erik Andersson
Hi 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!! Best Regards / Erik CIP Development

Re: Import and merge into branch

2004-10-29 Thread Mark D. Baushke
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 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

RE: Import and merge into branch

2004-10-31 Thread Erik Andersson
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 -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Erik Andersson <[EMAIL PROTECTED]> writes: > I messed up and need to to a fres

Re: Import and merge into branch

2004-10-31 Thread Mark D. Baushke
L 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 a

RE: Import and merge into branch

2004-10-31 Thread Erik Andersson
iginal Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Mark D. Baushke Sent: den 31 oktober 2004 16:47 To: Erik Andersson Cc: [EMAIL PROTECTED] Subject: Re: Import and merge into branch -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Erik Andersson <[EMAIL PROTECTED]&g

Re: Import and merge into branch

2004-10-31 Thread Mark D. Baushke
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Erik Andersson <[EMAIL PROTECTED]> writes: > So it's really now risk in creating the branches directly from the > release version tags? There is no risk that cvs will get something confused. (The same may not be true for yourself.) > Someone told me

Re: Import and merge into branch

2004-11-03 Thread Greg A. Woods
[ On Sunday, October 31, 2004 at 20:59:56 (-0800), Mark D. Baushke wrote: ] > Subject: Re: Import and merge into branch > > There is no risk of cvs getting confused by creating a new branch from a > version tag of any kind. That's not exactly true in all cases. ;-) CVS will