• Status: Solved
  • Priority: Medium
  • Security: Public
  • Views: 282
  • Last Modified:

CVS: half-joining project branches

Hello,

In my project there are two branches, main developement branch, and old stable version branch tagged alfa-1. There are two libraries in separate directories

/lib/libfoo
/lib/libbar

Now how can I join libbar in both main and alfa-1 branches, so they will be developed together, while leaving different versions of libfoo library in two branches?
0
Robson
Asked:
Robson
  • 5
  • 4
  • 2
  • +2
1 Solution
 
AlexNekCommented:
2 Robson
If you want to merge two a little different projects
main /lib/libbar
alfa1 /lib/libbar
you can try one trick with 2 developers. Both get main/lib/libbar, first check it out. Second get in addition alfa1/lib/libbar, clear read only flag, check out main/lib/libbar, copy local version of alfa1/lib/libbar to main/lib/libbar. Second do check in, first do check, resolve merge conflicts.
When you have only one library main/lib/libbar you connect it as new project to alfa1 and delete the old one.
0
 
ahoffmannCommented:
silly question: how would you arrange the identical filenames from libfoo and libbar in the same directory?
0
 
RobsonAuthor Commented:
I see my questions is not clear, so lets try again.

libfoo and libbar are completely different libraries (although libfoo requires libbar to operate, and both are required by project main application). Now it looks like this:

main branch:
     /lib/libfoo-0
     /lib/libbar-1

alfa branch:
     /lib/libfoo-0
     /lib/libbar-0

Now I'd like to update libbar to version 1 in both branches and I want any changes made to libbar-1 in future to be valid for both branches.
0
Concerto's Cloud Advisory Services

Want to avoid the missteps to gaining all the benefits of the cloud? Learn more about the different assessment options from our Cloud Advisory team.

 
ahoffmannCommented:
> Now I'd like to update libbar to version 1 in both branches ..
Do you have t separate branches? or is your "main branch" the trunk of the repository?
If it is the trunk, cvs supports special commands to merge a brunch to the trunk.
0
 
RobsonAuthor Commented:
Yes, 'main' is a trunk. But will these commands work in opposite way, that is moving from trunk to branch? And remember, I want to do that to libbar only, leaving libfoo in branch.
0
 
ahoffmannCommented:
Never did it (I hate cvs merging), simply know that the cvs docs show a ways to merge a branch into th etrunk. That's all. Sorry
0
 
nico5038Commented:

No comment has been added lately, so it's time to clean up this TA.
I will leave a recommendation in the Cleanup topic area that this question is:
 - PAQ'd and pts refunded
Please leave any comments here within the
next seven days.

PLEASE DO NOT ACCEPT THIS COMMENT AS AN ANSWER !

Nic;o)
0
 
RobsonAuthor Commented:
An now I have more experience with CVS, I can see that my original question was against its branches and revisions system. Now I would solve my problem this way: merge libbar in the project trunk and create separate branch for libfoo-1. A word to future CVS users: spend some on learning it before creating large projects with many branches. Unfortunately I had been thrown straight into deep water :-(
0
 
ahoffmannCommented:
so my suggestion about branches on the trunk was not that bad ;-)
0
 
RobsonAuthor Commented:
And that is what I finally done, but because of my previous errors in project management I was forced to sacrifice some concurrency: in this case stop developement of one branch in my project.
0
 
ahoffmannCommented:
damn, but I suggested *my opinion* about CVS and some of it's "features". Didn't I? :-)

Anyway, if you found the solution yourself, ask support @ EE to refund the points and mark this as PAQ ('cause I think it's a valuable question, somehow).
0
 
nico5038Commented:
Hmm, looks like my recommandation isn't that bad at all, thanks ahoffmann :-)

Nic;o)
0
 
moduloCommented:
Finalized as proposed

modulo

Community Support Moderator
Experts Exchange
0

Featured Post

Concerto Cloud for Software Providers & ISVs

Can Concerto Cloud Services help you focus on evolving your application offerings, while delivering the best cloud experience to your customers? From DevOps to revenue models and customer support, the answer is yes!

Learn how Concerto can help you.

  • 5
  • 4
  • 2
  • +2
Tackle projects and never again get stuck behind a technical roadblock.
Join Now