Solved

CVS: half-joining project branches

Posted on 2002-05-16
13
273 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
  • 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
 
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
How your wiki can always stay up-to-date

Quip doubles as a “living” wiki and a project management tool that evolves with your organization. As you finish projects in Quip, the work remains, easily accessible to all team members, new and old.
- Increase transparency
- Onboard new hires faster
- Access from mobile/offline

 
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

What Is Threat Intelligence?

Threat intelligence is often discussed, but rarely understood. Starting with a precise definition, along with clear business goals, is essential.

Join & Write a Comment

This article is meant to give a basic understanding of how to use R Sweave as a way to merge LaTeX and R code seamlessly into one presentable document.
In this post we will learn how to connect and configure Android Device (Smartphone etc.) with Android Studio. After that we will run a simple Hello World Program.
Viewers will learn how to properly install Eclipse with the necessary JDK, and will take a look at an introductory Java program. Download Eclipse installation zip file: Extract files from zip file: Download and install JDK 8: Open Eclipse and …
In this fourth video of the Xpdf series, we discuss and demonstrate the PDFinfo utility, which retrieves the contents of a PDF's Info Dictionary, as well as some other information, including the page count. We show how to isolate the page count in a…

760 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

Need Help in Real-Time?

Connect with top rated Experts

21 Experts available now in Live!

Get 1:1 Help Now