Solved

CVS: half-joining project branches

Posted on 2002-05-16
13
279 Views
Last Modified: 2010-04-17
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
Comment
Question by:Robson
[X]
Welcome to Experts Exchange

Add your voice to the tech community where 5M+ people just like you are talking about what matters.

  • Help others & share knowledge
  • Earn cash & points
  • Learn & ask questions
  • 5
  • 4
  • 2
  • +2
13 Comments
 
LVL 16

Expert Comment

by:AlexNek
ID: 7014394
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
 
LVL 51

Expert Comment

by:ahoffmann
ID: 7014747
silly question: how would you arrange the identical filenames from libfoo and libbar in the same directory?
0
 
LVL 4

Author Comment

by:Robson
ID: 7015628
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
What does it mean to be "Always On"?

Is your cloud always on? With an Always On cloud you won't have to worry about downtime for maintenance or software application code updates, ensuring that your bottom line isn't affected.

 
LVL 51

Expert Comment

by:ahoffmann
ID: 7015894
> 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
 
LVL 4

Author Comment

by:Robson
ID: 7015914
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
 
LVL 51

Expert Comment

by:ahoffmann
ID: 7015943
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
 
LVL 54

Expert Comment

by:nico5038
ID: 7515095

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
 
LVL 4

Author Comment

by:Robson
ID: 7519595
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
 
LVL 51

Expert Comment

by:ahoffmann
ID: 7521031
so my suggestion about branches on the trunk was not that bad ;-)
0
 
LVL 4

Author Comment

by:Robson
ID: 7521077
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
 
LVL 51

Expert Comment

by:ahoffmann
ID: 7521307
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
 
LVL 54

Expert Comment

by:nico5038
ID: 7521317
Hmm, looks like my recommandation isn't that bad at all, thanks ahoffmann :-)

Nic;o)
0
 

Accepted Solution

by:
modulo earned 0 total points
ID: 7528392
Finalized as proposed

modulo

Community Support Moderator
Experts Exchange
0

Featured Post

Optimize your web performance

What's in the eBook?
- Full list of reasons for poor performance
- Ultimate measures to speed things up
- Primary web monitoring types
- KPIs you should be monitoring in order to increase your ROI

Question has a verified solution.

If you are experiencing a similar issue, please ask a related question

A short article about problems I had with the new location API and permissions in Marshmallow
Although it can be difficult to imagine, someday your child will have a career of his or her own. He or she will likely start a family, buy a home and start having their own children. So, while being a kid is still extremely important, it’s also …
An introduction to basic programming syntax in Java by creating a simple program. Viewers can follow the tutorial as they create their first class in Java. Definitions and explanations about each element are given to help prepare viewers for future …
Simple Linear Regression

627 members asked questions and received personalized solutions in the past 7 days.

Join the community of 500,000 technology professionals and ask your questions.

Join & Ask a Question