[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS: replacing the head with a branch
From: |
KM |
Subject: |
CVS: replacing the head with a branch |
Date: |
Tue, 21 Feb 2017 17:37:37 +0000 (UTC) |
Hi All,We have a ton of development on the trunk/HEAD which we've never used
due to changes in our releases off the branch for a time. The development was
done by folks who are no longer with the company. Instead of sorting through
all of that and figuring out what works and what does not, we want to make the
head look like our latest branch. For our argument lets say 'branch20'.
I found the following post,
http://stackoverflow.com/questions/115098/cvs-replace-head-with-a-branch . I
tried this in a local working directory (without actually committing yet).
When I check out the branch and diff it against this it is the same..... so it
seems that this procedure works.
This is probably a stupid question, but this is just like replacing files and
committing as normal right? 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? And if we have more
incremental updates for 2.0 I can still continue along the branch 'branch20'
and merge back into the trunk afterward? 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.
Thanks in advanceKM
- CVS: replacing the head with a branch,
KM <=