CVS: replacing the head with a branch
KM <[email protected]> Tue, 21 Feb 2017 17:37:37 +0000 (UTC)
| Newsgroups | gmane.comp.version-control.cvs.general |
|---|---|
| Message-ID | <[email protected]> |
=20 Hi All,We have a ton of development on the trunk/HEAD which we've never use= d due to changes in our releases off the branch for a time.=C2=A0 The devel= opment was done by folks who are no longer with the company.=C2=A0=C2=A0Ins= tead of sorting through all of that and figuring out what works and what do= es not, we want to make the head look like our latest branch.=C2=A0 For our= argument lets say 'branch20'. I found the following post, http://stackoverflow.com/questions/115098/cvs-r= eplace-head-with-a-branch=C2=A0.=C2=A0 I tried this in a local working dire= ctory (without actually committing yet).=C2=A0 When I check out the branch = and diff it against this it is the same..... so it seems that this procedur= e works. This is probably a stupid question, but this is just like replacing files a= nd committing as normal right?=C2=A0 meaning I will now be able to use the = trunk as I did before for my main/major version builds (for next release 3.= 0), but it will just look like my update branch 'branch20' now?=C2=A0 And i= f we have more incremental updates for 2.0=C2=A0I can still continue along = the branch 'branch20' and merge back into the trunk afterward?=C2=A0 Sorry = if this is hard to explain in words. I think it's fine, I just wanted to be sure I wasn't going to mess up CVS.= =C2=A0=20 Thanks in advanceKM