[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Overwriting trunk files with specific branch files

From: Andy Jones
Subject: Re: Overwriting trunk files with specific branch files
Date: Tue, 16 Aug 2005 16:41:01 +0100

1) Check out the tagged files from the branch into directory A.
2) Check out the trunk into directory B.
3) Copy all the files from A into B.
4) Commit B.

Does that work?

On 16/08/05, address@hidden
<address@hidden> wrote:
> Thanks. I definitely do NOT want to do a manual copy.
> I have tags for merging from branchA to branchB, both
> off my trunk, but I don't have tags to handle the branchA
> to trunk merges. Like you said, the '-j' trick is what
> I need/want.
> I've done this once, based on a suggestion from this
> mailing list, but I just can't find my freaking notes!
> -chris
> >-----Original Message-----
> >From: Douglas Wade Needham [mailto:address@hidden
> >Sent: Tuesday, August 16, 2005 10:53 AM
> >To: Fouts Christopher (IFNA MP DC)
> >Cc: address@hidden
> >Subject: Re: Overwriting trunk files with specific branch files
> >
> >
> >Two options...
> >
> >1) Manually check out a copy of both, copy the version from the branch
> >   over to the working trunk copy and then checkin.
> >
> >2) Read the sections on merging in "Branching and merging" and have
> >   cvs help you do it when you use a '-j' option.  If you want a pure
> >   100% overwrite, you may have to fall back to copying manually.
> >
> >When copying for a pure overwrite, be wary, in doing so, you
> >may end up loosing deltas in your mainline which are required,
> >and break your mainline.  And you should also remember to tag
> >both the trunk and the branch as mentioned in "Merging from a
> >branch several times" when you do so.  This will help you
> >enormously in the future.
> >
> >Oh, and if you are a user of emacs, look though the ediff-
> >functions. There are nice functions such as
> >ediff-merge-revisions-with-ancestor
> >which come in helpful here.  But they work on a file-by-file
> >basis, and so are mostly useless if you are dealing with
> >hundreds of files.
> >
> >- Doug
> >
> >Quoting address@hidden
> >(address@hidden):
> >> Say I have a trunk and branch named branchA. I have files
> >> on branchA tagged t_branchA_tagA. How can I overwrite my
> >> HEAD (on trunk) with the t_branchA_tagA files off my branchA?
> >
> >--
> >Douglas Wade Needham - KA8ZRT        UN*X Consultant & UW/BSD
> >kernel programmer
> >Email:  cinnion @ ka8zrt . com
> >Disclaimer: My opinions are my own.  Since I don't want them, why
> >            should my employer, or anybody else for that matter!
> >
> _______________________________________________
> Info-cvs mailing list
> address@hidden

reply via email to

[Prev in Thread] Current Thread [Next in Thread]